From nobody Tue Feb 10 01:34:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598007354; cv=none; d=zohomail.com; s=zohoarc; b=jv87mJOpcxkNqY1u7XMGpwgs3M/fHcKC2lOjaxnBzw7F4sydm3c6YdJ0jX5pZw72kZyeZm0hQoXbvzPRexOHWUdiA5NCL2FRCA43YPguvmpzdQztPwuRcGdKZ+Zk2DnfktrGlEuhLJddZmXc3R57XQlX/FX5J6hHE45OUF0kjTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598007354; 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=ZrFnyMZH+f4YkyOO026qZZWf1ZTcWNcDftfN3KsDDwk=; b=WfKWdzDzyJNPOtrKyUT8a8951zqvr9vf++WZnPIuhhvQocRZeIs+ejht0GKftFblBrE3xfqHveOSC/YXmhZBzdNdlQWj83asc+jN7bw94NuHedrP/C52tNDN/KkwhO+mMCM8Rull/D5unAh7Xqi/UU1KYtYYFKauwAyzBBvxXEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1598007354166593.3292043735632; Fri, 21 Aug 2020 03:55:54 -0700 (PDT) Received: from localhost ([::1]:47940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k94i8-0006UE-T2 for importer@patchew.org; Fri, 21 Aug 2020 06:55:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k94Dw-0002SE-On for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:24:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k94Ds-0001fo-8z for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:24:40 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-MdWfYWqJOQyyOOUAu9LCwA-1; Fri, 21 Aug 2020 06:24:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D59E3801ABF for ; Fri, 21 Aug 2020 10:24:32 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99B695C1D0 for ; Fri, 21 Aug 2020 10:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598005475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZrFnyMZH+f4YkyOO026qZZWf1ZTcWNcDftfN3KsDDwk=; b=Xq87f4/yyDjX865NRKzlpvtTwK97SaoEiOqVh1iOEa0k/NRWCCUxdmpZphOeEfMhfA+vqm Uv674h2TV1Iw1Umrp8g++IqnJGrhLXXNHTdnFFDed9+MozFKUWJB7GmXn/rt3dhLv8IRan 34fknn6dYH4eNfZrPThGPcsBghvKsog= X-MC-Unique: MdWfYWqJOQyyOOUAu9LCwA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v8 074/152] meson: convert most of softmmu/ Date: Fri, 21 Aug 2020 06:22:11 -0400 Message-Id: <20200821102329.29777-75-pbonzini@redhat.com> In-Reply-To: <20200821102329.29777-1-pbonzini@redhat.com> References: <20200821102329.29777-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 02:43:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Leave out main.c, it's special due to fuzzing. Signed-off-by: Paolo Bonzini --- meson.build | 2 ++ softmmu/Makefile.objs | 14 +------------- softmmu/meson.build | 10 ++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 softmmu/meson.build diff --git a/meson.build b/meson.build index ff200900ed..442855daef 100644 --- a/meson.build +++ b/meson.build @@ -645,6 +645,8 @@ softmmu_ss.add(when: ['CONFIG_FDT', fdt], if_true: [fi= les('device_tree.c')]) =20 common_ss.add(files('cpus-common.c')) =20 +subdir('softmmu') + # needed for fuzzing binaries subdir('tests/qtest/libqos') =20 diff --git a/softmmu/Makefile.objs b/softmmu/Makefile.objs index c036887500..ec74d8a9fa 100644 --- a/softmmu/Makefile.objs +++ b/softmmu/Makefile.objs @@ -1,14 +1,2 @@ softmmu-main-y =3D softmmu/main.o - -obj-y +=3D arch_init.o -obj-y +=3D cpus.o -obj-y +=3D cpu-throttle.o -obj-y +=3D balloon.o -obj-y +=3D ioport.o -obj-y +=3D memory.o -obj-y +=3D memory_mapping.o - -obj-y +=3D qtest.o - -obj-y +=3D vl.o -vl.o-cflags :=3D $(SDL_CFLAGS) +main.o-cflags :=3D $(SDL_CFLAGS) diff --git a/softmmu/meson.build b/softmmu/meson.build new file mode 100644 index 0000000000..95d38df259 --- /dev/null +++ b/softmmu/meson.build @@ -0,0 +1,10 @@ +specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( + 'arch_init.c', + 'balloon.c', + 'cpus.c', + 'cpu-throttle.c', + 'ioport.c', + 'memory.c', + 'memory_mapping.c', + 'qtest.c', + 'vl.c')) --=20 2.26.2