From nobody Mon Feb 9 16:34: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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580238352292468.8535464080393; Tue, 28 Jan 2020 11:05:52 -0800 (PST) Received: from localhost ([::1]:35694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwWBL-00069W-7V for importer@patchew.org; Tue, 28 Jan 2020 14:05:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34218) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwV6U-0001wz-H8 for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:56:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwV6T-00056w-GL for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:56:46 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iwV6T-00055z-AA for qemu-devel@nongnu.org; Tue, 28 Jan 2020 12:56:45 -0500 Received: by mail-wm1-x342.google.com with SMTP id g1so3500527wmh.4 for ; Tue, 28 Jan 2020 09:56:45 -0800 (PST) Received: from localhost.localdomain (93-36-56-206.ip58.fastwebnet.it. [93.36.56.206]) by smtp.gmail.com with ESMTPSA id o4sm27046968wrx.25.2020.01.28.09.56.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 09:56:43 -0800 (PST) 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=CiT2xrnkCUDt+XbyDWXNaZpFC+PLTWyb0mxHnYb7Opk=; b=GC38+tHTQWLWIXlLlbFG1B8aPqu51ByjsaLEX9n7m5kkP42+zygSQHpxWQLwe13pHF TvFKaoEFxf2102ufUEK3qApclsxeBwuMIMTGgLY2hMMbeBaR2OEs1huZYGzx4mhBYLfg vs/ecWfMtvEPVCyzxjYK/xMf8GfGEyB03mUho+WWQ3DvaBWuAgAOqyUPlISQGBiX7/wt V7mfCjmmR/h3pLKDrSk01UPAaUOZRrasK+4PpgrOwrNCoK6vTY68CqJhxmbGrOgwHqGw O0Y+6Hw43mJIEJZhzrdq2lJ8HVL0rF6Zl6EGAFF6p3RBl4tMOC9SA/KkTKSYRuDOe6Ox 87oA== 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=CiT2xrnkCUDt+XbyDWXNaZpFC+PLTWyb0mxHnYb7Opk=; b=nyJt1gioWfRuwkDIObaITzvVhnz+SPrDR/n3xqRSiavRbzPezK12cDKTNfKu9RYA4l VFMjS16PYKfigPPfSHf9F0qWl6K+JGWfH0a+Gfa7a1UI597LRSxXghmS+WEzpj0fynOj 79xJst7p+pSAJf4w0g4kkx+BaDr2oA8105XRYzmJeqK7TBOrTCi0VncpSwJ3EYNL5yMH 4WUG3gZ2npdQwA39RjlxUuojaN+Mob/u9Zps3adTgjlHUnZPbC+FENnYRDBjnsY4ryDE lDaPhmVY/6ybcJLyXQ2xLFQ7WxM7pa1XGLM4SNPcnMStfQ7nKv8vMcpGqlg4c/rHGW7j SheQ== X-Gm-Message-State: APjAAAVUnAVR7wQjxAxlFJ2Yu/niair8Wim6BJNr+BkjVsrNlILcWR81 Y+ShMwlZEJXrPEX0F4Nce+jolv5b X-Google-Smtp-Source: APXvYqzTtEJlEop/muUibq12F1dZ4EsK4qgJ2hWRiLvhF+KYucb0bOJFOO3Eq2Z/RyWwYajQkympmQ== X-Received: by 2002:a1c:9dcb:: with SMTP id g194mr6192792wme.53.1580234204099; Tue, 28 Jan 2020 09:56:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 074/142] meson: convert hw/mem Date: Tue, 28 Jan 2020 18:52:34 +0100 Message-Id: <20200128175342.9066-75-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200128175342.9066-1-pbonzini@redhat.com> References: <20200128175342.9066-1-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::342 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 --- hw/Makefile.objs | 1 - hw/mem/Kconfig | 1 + hw/mem/meson.build | 6 ++++++ hw/meson.build | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 hw/mem/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 546da511a6..636c4f1fed 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -34,7 +34,6 @@ devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ devices-dirs-y +=3D virtio/ devices-dirs-y +=3D watchdog/ -devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index 620fd4cb59..9e6c6b8236 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -9,3 +9,4 @@ config NVDIMM bool default y depends on PC + select MEM_DEVICE diff --git a/hw/mem/meson.build b/hw/mem/meson.build new file mode 100644 index 0000000000..ba424622bb --- /dev/null +++ b/hw/mem/meson.build @@ -0,0 +1,6 @@ +mem_ss =3D ss.source_set() +mem_ss.add(files('memory-device.c')) +mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c')) +mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) + +softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) diff --git a/hw/meson.build b/hw/meson.build index dccc2d19a6..542d675618 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('mem') subdir('nubus') subdir('semihosting') subdir('smbios') --=20 2.21.0