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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 A3A13C43603 for ; Thu, 12 Dec 2019 13:32:52 +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 6AD1C20637 for ; Thu, 12 Dec 2019 13:32:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kx7Duzrw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AD1C20637 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]:59358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOaI-00025E-Ny for qemu-devel@archiver.kernel.org; Thu, 12 Dec 2019 08:32:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36224) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyZ-0003px-Ez for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyY-0007B5-9z for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:51 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39592) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyY-00079M-1X for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:50 -0500 Received: by mail-wr1-x435.google.com with SMTP id y11so2613952wrt.6 for ; Thu, 12 Dec 2019 04:53:49 -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=I4kIdx5/B7vhPeGSC/yHPjfKMOrsksBPLKlOIGo7xQE=; b=Kx7Duzrw63cyTVzGjM9zxolW3DSi15Yg8QS5yAzeOK3kdbFZrgwfjIuAQVrL1/uhbU fP6OmUUIOUB9RGa8KwjMn4ErQZlyrTK1h7sjeTJ1rOYExDhtik7/8jloeHm6lh9inSjr 0CeGoF0mHqwBDJnSRGhqdEe3+XacgWAK+g7J5exKRmzRsJju0kFFxbB8uTbFIwZbh4BD NkCD9HBWGxI7wAacKt6tp7dIPSDdv5jGXtpeVB70T82QRjHyJPGg2ET5aFcU+sxroMdV A0kYKBE2T7ech3VHwZOLroI6+SpWnaRr1tDZD1wb5+ehzHneg/eGEyoatw4nPnjgN550 UjCA== 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=I4kIdx5/B7vhPeGSC/yHPjfKMOrsksBPLKlOIGo7xQE=; b=kr4YqYHaJDW9w455+ZOZDvekcUUadCqXJEpHjmGEdh+0FsfEofpqfGftfnMO9YY/sR DGZGZEpL7wRkYTrkUMMTDU/xyYVIsFSnRIPxrBQvK8hcZEelH8H78Vl/OdijJIFFCXsG n1RFJRu6+vU1GntE/HePmJtP6ZrK3VF4o49l5I0gD37PY91RfQK7GVZecim13+k9O5OZ gzqBmgJCLkS3OkQjplPBeiLEDnUK5x50TVVqNMQUGyykdBcZTxgL+EgjLZLxFmqkITbl gI4621TPl8SquYdOc1LZy6FcL8LW3PHbTsIc9Qx/tkGkUh43Nqix7hBqh4cjH6C0oSAi RksQ== X-Gm-Message-State: APjAAAVK7trojTZbeqtD/YLsuiyd0MNkdE221imj6MmhtvGJed5cCzhA 6SOlQSrh5+pQpqDld/21eA1DXta5 X-Google-Smtp-Source: APXvYqzujCYIz6pWqghF8eZxljM2HM9TFDW4pY74V+ZQ4IMg59TP7AokTf4Xc4mRKQkz1VMcxSbfDg== X-Received: by 2002:adf:f802:: with SMTP id s2mr6204146wrp.201.1576155228887; Thu, 12 Dec 2019 04:53:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 051/132] meson: convert qom/ Date: Thu, 12 Dec 2019 13:51:35 +0100 Message-Id: <1576155176-2464-52-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: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau --- Makefile.objs | 1 - qom/Makefile.objs | 1 - qom/meson.build | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) delete mode 100644 qom/Makefile.objs diff --git a/Makefile.objs b/Makefile.objs index e9ae889..0bc9167 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -71,7 +71,6 @@ endif # Target-independent parts used in system and user emulation common-obj-y += hw/ -common-obj-y += qom/ common-obj-y += disas/ ###################################################################### diff --git a/qom/Makefile.objs b/qom/Makefile.objs deleted file mode 100644 index fc1248e..0000000 --- a/qom/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o diff --git a/qom/meson.build b/qom/meson.build index 4af044d..3875663 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -13,3 +13,8 @@ libqom = static_library('qom', qom_ss.sources(), name_suffix: 'fa') qom = declare_dependency(link_whole: libqom) + +softmmu_ss.add(files( + 'qom-hmp-cmds.c', + 'qom-qmp-cmds.c', +)) -- 1.8.3.1