From nobody Mon Feb 9 19:07:45 2026 Delivered-To: importer@patchew.org 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; 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=1576158706; cv=none; d=zohomail.com; s=zohoarc; b=Equ7HiKHjzZRvT41577Jzni2h2+GfzTBc/+WA3cqs/sK2oysnaSlDeae7LtFwvGZu+qU2Uzrjj6dVMvH+TV4o0qF3Q+KONBgSB/TpWlZ9c5EoWjxBYfdhUnYDSY5KsapXrQ+puOazMMGQ+p1afM8hbCUN8z5XZbYl2ghknYhbwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576158706; h=Content-Type:Content-Transfer-Encoding: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=KINz8qNx0+6jNJVJIJbHyBsbBQ9NgbXzB65P3pZovbE=; b=Lx9pLhdJEou/aS8Qd8prq8K+QMeEQCNnJQLEuLW38LvE5HAnOPSEBiRguPHkgI+aPYbRPoVby11N2vkMAxMPEKDjpijiK/B1IU+AevWKVGiS7XSbw7ISkBBQCUZNgbFuBCxK8Bd/kVruAde8oD5r+QvIDIxzfP+ryMNLT6imA5o= 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 15761587062571014.9683118970762; Thu, 12 Dec 2019 05:51:46 -0800 (PST) Received: from localhost ([::1]:59574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOsa-0006wV-P6 for importer@patchew.org; Thu, 12 Dec 2019 08:51:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNz6-0004ed-26 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNz4-00087u-5m for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:23 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:37693) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNz3-00086h-U2 for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:54:22 -0500 Received: by mail-wr1-x431.google.com with SMTP id w15so2627758wru.4 for ; Thu, 12 Dec 2019 04:54:21 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.54.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KINz8qNx0+6jNJVJIJbHyBsbBQ9NgbXzB65P3pZovbE=; b=g3wZaF57FmC5Cb6xq9Ra12TSi2jqxMy5iKL3i4rqThLoQvL+klwpsrh7JwtiZ1+5wB rcSuZrgScK7Kz7ydJjg6vej/iv9tRKIX/GyogoqOu4GbuxeL9oKIOFIyFSIvRe6J8aqy ZPdV27p0Cthxr/k/i3FeX0LF889UFykfmC+tEFDHa6vEEYVDXSiEVbkY+GlwEIPDbhNm Nx0ielZhSPQIjtcaXODw3ENxRieVd22KD1CXI+5gNwO1pjHFQa5IrerDzsP6SVdaiZRG h+sFsTVNldm1OzgmHrXvdKP6NnJy+IsnxvzRHigQnIGjYARgouWBN/NrQWfcbkjrZQFm yPfw== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KINz8qNx0+6jNJVJIJbHyBsbBQ9NgbXzB65P3pZovbE=; b=q5X4CaVNs8Sw7Nb1toroaQpF6/sLg+1Z9fQwFBFeB7JiZii6682j0gxzuMBn3N4oro plRBZ3lGFrzgzvS99Rmywl4VwOqkTfhtsqZUpAUrR6rGJexzom26n2JJFEuWWNd8PI1V /8B38ZMcj5uloIVBnTrb8uGtn3nKUKSun2Wr12nGR4mPWlDEMAAzq1mn+v044kXetnhZ Tmx4yA96kQtvM8zffw6xXo4vdLSuQspXHVGFUIi5IMQlXzHYcnJSnfpvP8J4UEslQK1d bd9Vrj7ghvlidGwTjBn3tkJ5/mJUyYvgB7k87yAqHdp0zkSrXOFERVgIs+Lxj7E/uLVO CRiA== X-Gm-Message-State: APjAAAVp1B9ofu/OJb4HeFE4deCvCWrefjnLIGpvBqUxdD2aUBFS8a6o DMWMuYaxsfT1TSD6BgDRvGERWMAr X-Google-Smtp-Source: APXvYqxJGuTMkO0rmMS7DGTT230AlEOpq9Pp454QviYCS3sqG3alWDTz0rwT3h76xP+N1WM4Ytd6Ww== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr5998596wrt.208.1576155260660; Thu, 12 Dec 2019 04:54:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 083/132] meson: convert hw/net Date: Thu, 12 Dec 2019 13:52:07 +0100 Message-Id: <1576155176-2464-84-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 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: , 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 --- hw/Makefile.objs | 1 - hw/meson.build | 1 + hw/net/Makefile.objs | 53 ----------------------------------------- hw/net/can/Makefile.objs | 4 ---- hw/net/can/meson.build | 4 ++++ hw/net/meson.build | 61 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 6 files changed, 66 insertions(+), 58 deletions(-) delete mode 100644 hw/net/Makefile.objs delete mode 100644 hw/net/can/Makefile.objs create mode 100644 hw/net/can/meson.build create mode 100644 hw/net/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4903808..d9479e3 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -19,7 +19,6 @@ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ devices-dirs-y +=3D isa/ devices-dirs-y +=3D misc/ -devices-dirs-y +=3D net/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 56e6057..3b20fea 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,5 +1,6 @@ subdir('core') subdir('mem') +subdir('net') subdir('nvram') subdir('pci') subdir('pci-bridge') diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs deleted file mode 100644 index 9904273..0000000 --- a/hw/net/Makefile.objs +++ /dev/null @@ -1,53 +0,0 @@ -common-obj-$(CONFIG_DP8393X) +=3D dp8393x.o -common-obj-$(CONFIG_XEN) +=3D xen_nic.o -common-obj-$(CONFIG_NE2000_COMMON) +=3D ne2000.o - -# PCI network cards -common-obj-$(CONFIG_NE2000_PCI) +=3D ne2000-pci.o -common-obj-$(CONFIG_EEPRO100_PCI) +=3D eepro100.o -common-obj-$(CONFIG_PCNET_PCI) +=3D pcnet-pci.o -common-obj-$(CONFIG_PCNET_COMMON) +=3D pcnet.o -common-obj-$(CONFIG_E1000_PCI) +=3D e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI_EXPRESS) +=3D e1000e.o e1000e_core.o e1000x= _common.o -common-obj-$(CONFIG_RTL8139_PCI) +=3D rtl8139.o -common-obj-$(CONFIG_VMXNET3_PCI) +=3D net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_VMXNET3_PCI) +=3D vmxnet3.o - -common-obj-$(CONFIG_SMC91C111) +=3D smc91c111.o -common-obj-$(CONFIG_LAN9118) +=3D lan9118.o -common-obj-$(CONFIG_NE2000_ISA) +=3D ne2000-isa.o -common-obj-$(CONFIG_OPENCORES_ETH) +=3D opencores_eth.o -common-obj-$(CONFIG_XGMAC) +=3D xgmac.o -common-obj-$(CONFIG_MIPSNET) +=3D mipsnet.o -common-obj-$(CONFIG_XILINX_AXI) +=3D xilinx_axienet.o -common-obj-$(CONFIG_ALLWINNER_EMAC) +=3D allwinner_emac.o -common-obj-$(CONFIG_IMX_FEC) +=3D imx_fec.o - -common-obj-$(CONFIG_CADENCE) +=3D cadence_gem.o -common-obj-$(CONFIG_STELLARIS_ENET) +=3D stellaris_enet.o -common-obj-$(CONFIG_LANCE) +=3D lance.o -common-obj-$(CONFIG_SUNHME) +=3D sunhme.o -common-obj-$(CONFIG_FTGMAC100) +=3D ftgmac100.o -common-obj-$(CONFIG_SUNGEM) +=3D sungem.o - -obj-$(CONFIG_ETRAXFS) +=3D etraxfs_eth.o -obj-$(CONFIG_COLDFIRE) +=3D mcf_fec.o -obj-$(CONFIG_MILKYMIST) +=3D milkymist-minimac2.o -obj-$(CONFIG_PSERIES) +=3D spapr_llan.o -obj-$(CONFIG_XILINX_ETHLITE) +=3D xilinx_ethlite.o - -obj-$(CONFIG_VIRTIO_NET) +=3D virtio-net.o -common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) +=3D vhos= t_net.o -common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET= ))) +=3D vhost_net-stub.o -common-obj-$(CONFIG_ALL) +=3D vhost_net-stub.o - -obj-$(CONFIG_ETSEC) +=3D fsl_etsec/etsec.o fsl_etsec/registers.o \ - fsl_etsec/rings.o fsl_etsec/miim.o - -common-obj-$(CONFIG_ROCKER) +=3D rocker/rocker.o rocker/rocker_fp.o \ - rocker/rocker_desc.o rocker/rocker_world.o \ - rocker/rocker_of_dpa.o -obj-$(call lnot,$(CONFIG_ROCKER)) +=3D rocker/qmp-norocker.o - -common-obj-$(CONFIG_CAN_BUS) +=3D can/ diff --git a/hw/net/can/Makefile.objs b/hw/net/can/Makefile.objs deleted file mode 100644 index 9f0c4ee..0000000 --- a/hw/net/can/Makefile.objs +++ /dev/null @@ -1,4 +0,0 @@ -common-obj-$(CONFIG_CAN_SJA1000) +=3D can_sja1000.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_kvaser_pci.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_pcm3680_pci.o -common-obj-$(CONFIG_CAN_PCI) +=3D can_mioe3680_pci.o diff --git a/hw/net/can/meson.build b/hw/net/can/meson.build new file mode 100644 index 0000000..c9cfeb7 --- /dev/null +++ b/hw/net/can/meson.build @@ -0,0 +1,4 @@ +softmmu_ss.add(when: 'CONFIG_CAN_SJA1000', if_true: files('can_sja1000.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_kvaser_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_pcm3680_pci.c')) +softmmu_ss.add(when: 'CONFIG_CAN_PCI', if_true: files('can_mioe3680_pci.c'= )) diff --git a/hw/net/meson.build b/hw/net/meson.build new file mode 100644 index 0000000..9e7f176 --- /dev/null +++ b/hw/net/meson.build @@ -0,0 +1,61 @@ +softmmu_ss.add(when: 'CONFIG_DP8393X', if_true: files('dp8393x.c')) +softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_nic.c')) +softmmu_ss.add(when: 'CONFIG_NE2000_COMMON', if_true: files('ne2000.c')) + +# PCI network cards +softmmu_ss.add(when: 'CONFIG_NE2000_PCI', if_true: files('ne2000-pci.c')) +softmmu_ss.add(when: 'CONFIG_EEPRO100_PCI', if_true: files('eepro100.c')) +softmmu_ss.add(when: 'CONFIG_PCNET_PCI', if_true: files('pcnet-pci.c')) +softmmu_ss.add(when: 'CONFIG_PCNET_COMMON', if_true: files('pcnet.c')) +softmmu_ss.add(when: 'CONFIG_E1000_PCI', if_true: files('e1000.c', 'e1000x= _common.c')) +softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('net_tx_p= kt.c', 'net_rx_pkt.c')) +softmmu_ss.add(when: 'CONFIG_E1000E_PCI_EXPRESS', if_true: files('e1000e.c= ', 'e1000e_core.c', 'e1000x_common.c')) +softmmu_ss.add(when: 'CONFIG_RTL8139_PCI', if_true: files('rtl8139.c')) +softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('net_tx_pkt.c', = 'net_rx_pkt.c')) +softmmu_ss.add(when: 'CONFIG_VMXNET3_PCI', if_true: files('vmxnet3.c')) + +softmmu_ss.add(when: 'CONFIG_SMC91C111', if_true: files('smc91c111.c')) +softmmu_ss.add(when: 'CONFIG_LAN9118', if_true: files('lan9118.c')) +softmmu_ss.add(when: 'CONFIG_NE2000_ISA', if_true: files('ne2000-isa.c')) +softmmu_ss.add(when: 'CONFIG_OPENCORES_ETH', if_true: files('opencores_eth= .c')) +softmmu_ss.add(when: 'CONFIG_XGMAC', if_true: files('xgmac.c')) +softmmu_ss.add(when: 'CONFIG_MIPSNET', if_true: files('mipsnet.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('xilinx_axienet.c= ')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_EMAC', if_true: files('allwinner_em= ac.c')) +softmmu_ss.add(when: 'CONFIG_IMX_FEC', if_true: files('imx_fec.c')) + +softmmu_ss.add(when: 'CONFIG_CADENCE', if_true: files('cadence_gem.c')) +softmmu_ss.add(when: 'CONFIG_STELLARIS_ENET', if_true: files('stellaris_en= et.c')) +softmmu_ss.add(when: 'CONFIG_LANCE', if_true: files('lance.c')) +softmmu_ss.add(when: 'CONFIG_SUNHME', if_true: files('sunhme.c')) +softmmu_ss.add(when: 'CONFIG_FTGMAC100', if_true: files('ftgmac100.c')) +softmmu_ss.add(when: 'CONFIG_SUNGEM', if_true: files('sungem.c')) + +specific_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_eth.c')) +specific_ss.add(when: 'CONFIG_COLDFIRE', if_true: files('mcf_fec.c')) +specific_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-minima= c2.c')) +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_llan.c')) +specific_ss.add(when: 'CONFIG_XILINX_ETHLITE', if_true: files('xilinx_ethl= ite.c')) + +specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) + +softmmu_ss.add(when: ['CONFIG_VIRTIO_NET', 'CONFIG_VHOST_NET'], if_true: f= iles('vhost_net.c'), if_false: files('vhost_net-stub.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) + +specific_ss.add(when: 'CONFIG_ETSEC', if_true: files( + 'fsl_etsec/etsec.c', + 'fsl_etsec/miim.c', + 'fsl_etsec/registers.c', + 'fsl_etsec/rings.c', +)) + +softmmu_ss.add(when: 'CONFIG_ROCKER', if_true: files( + 'rocker/rocker.c', + 'rocker/rocker_desc.c', + 'rocker/rocker_fp.c', + 'rocker/rocker_of_dpa.c', + 'rocker/rocker_world.c', +), if_false: files('rocker/qmp-norocker.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c')) + +subdir('can') --=20 1.8.3.1