From nobody Tue Feb 10 03:38:45 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=1597762161; cv=none; d=zohomail.com; s=zohoarc; b=KourM90JpOaFL+DS6iXG76TaANvns6HhbwVLIA6LmUz1d5hTg6MWztSyUMBNSmLrp3WZvVkCdZxp5YU/YNgG1CW5gvAYcpLX+yelm/yTUK1y729Gw12K0OS8X7SO6rEd4vNFUyRlN/f7A+oc5sNt+oBITYCxLtIzyTaIUOMvFpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597762161; 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=4dau1CiHZz2bXWc2CBvXPTV0eUpnr17179iwn/cN2qo=; b=UCkYdR3aJJG1qYLh0lcID6cGI9hsUh6byP0G5fjv3PeHq00r7p1ZwUqp0Rb5GqL+DmzBthF8Lqy7qcgLMkdi2fU8xqUZN1NosRwX6JgG5SadXFk8uyfvw5L/hhO2wVUUjDdEqPG2mDIcDOzxZ9WPUu0FnsKg+VNcLh/6a6QbIig= 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 1597762161787202.04077194193746; Tue, 18 Aug 2020 07:49:21 -0700 (PDT) Received: from localhost ([::1]:47762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82vQ-0004F9-HB for importer@patchew.org; Tue, 18 Aug 2020 10:49:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82L6-0004jO-61 for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50245 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82Kw-0007U5-Jl for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:11:47 -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-267-gqJWuY6YPNm6IYycwVpkUg-1; Tue, 18 Aug 2020 10:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C023100A954 for ; Tue, 18 Aug 2020 14:11:34 +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 DD5145D757 for ; Tue, 18 Aug 2020 14:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759896; 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=4dau1CiHZz2bXWc2CBvXPTV0eUpnr17179iwn/cN2qo=; b=IRsX7BTcGNYKJixz1mELY/73p21TOZPP5MFyuKe2uOs72eW623xXDuRCt8I8EyQKaEpPbw iG0HRw7I00TarcP9NHKznrl3s+RKvfTDsBElxNqTY3MmXMZxwZ/KXmiOzpNkePCO3SXG7/ 5yuap9eqhhZCd2h/eiu/aBtAYw9qhEo= X-MC-Unique: gqJWuY6YPNm6IYycwVpkUg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 077/150] meson: convert qemu-storage-daemon Date: Tue, 18 Aug 2020 10:09:12 -0400 Message-Id: <20200818141025.21608-78-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 06:40:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, 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" Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 10 ---------- meson.build | 2 +- storage-daemon/Makefile.objs | 3 --- storage-daemon/meson.build | 13 +++++++++++++ storage-daemon/qapi/meson.build | 5 +---- .../qemu-storage-daemon.c | 0 7 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 storage-daemon/Makefile.objs rename qemu-storage-daemon.c =3D> storage-daemon/qemu-storage-daemon.c (10= 0%) diff --git a/Makefile b/Makefile index 4ce2f4b2de..98d18c0bfb 100644 --- a/Makefile +++ b/Makefile @@ -170,8 +170,6 @@ include $(SRC_PATH)/Makefile.objs endif =20 dummy :=3D $(call unnest-vars,, \ - storage-daemon-obj-y \ - storage-daemon-obj-m \ common-obj-y \ common-obj-m) =20 @@ -187,7 +185,6 @@ TARGET_DIRS_RULES :=3D $(foreach t, all fuzz clean inst= all, $(addsuffix /$(t), $(T SOFTMMU_ALL_RULES=3D$(filter %-softmmu/all, $(TARGET_DIRS_RULES)) $(SOFTMMU_ALL_RULES): $(authz-obj-y) $(SOFTMMU_ALL_RULES): $(block-obj-y) -$(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y) $(SOFTMMU_ALL_RULES): $(chardev-obj-y) $(SOFTMMU_ALL_RULES): $(crypto-obj-y) $(SOFTMMU_ALL_RULES): $(io-obj-y) @@ -278,8 +275,6 @@ Makefile: $(version-obj-y) =20 COMMON_LDADDS =3D libqemuutil.a =20 -qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y) $(block= -obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y) $(storage= -daemon-obj-y) $(COMMON_LDADDS) - clean: recurse-clean ninja-clean clean-ctlist -test -f ninjatool && ./ninjatool $(if $(V),-v,) -t clean # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.objs b/Makefile.objs index d7826c1e5c..e304d92954 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -33,16 +33,6 @@ io-obj-y =3D io/libio.fa =20 endif # CONFIG_SOFTMMU or CONFIG_TOOLS =20 -####################################################################### -# storage-daemon-obj-y is code used by qemu-storage-daemon (these objects = are -# used for system emulation, too, but specified separately there) - -storage-daemon-obj-y =3D block/ qapi/ qom/ storage-daemon/ -storage-daemon-obj-y +=3D blockdev.o blockdev-nbd.o iothread.o job-qmp.o -storage-daemon-obj-$(CONFIG_WIN32) +=3D os-win32.o -storage-daemon-obj-$(CONFIG_POSIX) +=3D os-posix.o -storage-daemon-obj-y +=3D libqmp.fa - ###################################################################### # Target independent part of system emulation. The long term path is to # suppress *all* target specific code in case of system emulation, i.e. a diff --git a/meson.build b/meson.build index c5fe79f2ff..cc714786a5 100644 --- a/meson.build +++ b/meson.build @@ -587,7 +587,6 @@ subdir('util') subdir('qom') subdir('authz') subdir('crypto') -subdir('storage-daemon') subdir('ui') =20 =20 @@ -797,6 +796,7 @@ if have_tools dependencies: [block, qemuutil], install: true) endif =20 + subdir('storage-daemon') subdir('contrib/rdmacm-mux') subdir('contrib/elf2dmp') =20 diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs deleted file mode 100644 index 41c0d02178..0000000000 --- a/storage-daemon/Makefile.objs +++ /dev/null @@ -1,3 +0,0 @@ -storage-daemon-obj-y =3D qapi/libqsd-qapi.fa - -qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/= qapi/qapi-init-commands.h diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 35f8949924..0409acc3f5 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -1 +1,14 @@ +qsd_ss =3D ss.source_set() +qsd_ss.add(files('qemu-storage-daemon.c')) +qsd_ss.add(block, chardev, qmp, qom, qemuutil) +qsd_ss.add_all(blockdev_ss) + subdir('qapi') + +if have_tools + qsd_ss =3D qsd_ss.apply(config_host, strict: false) + executable('qemu-storage-daemon', + qsd_ss.sources(), + dependencies: qsd_ss.dependencies(), + install: true) +endif diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.bu= ild index 7a2b041247..cea618bec0 100644 --- a/storage-daemon/qapi/meson.build +++ b/storage-daemon/qapi/meson.build @@ -4,7 +4,4 @@ qsd_qapi_files =3D custom_target('QAPI files for qemu-stora= ge-daemon', command: [ qapi_gen, '-o', 'storage-daemon/= qapi', '@INPUT@' ], depend_files: [ qapi_inputs, qapi_gen_depen= ds ]) =20 -static_library('qsd-qapi', - qsd_qapi_files.to_list(), - name_suffix: 'fa', - build_by_default: false) +qsd_ss.add(qsd_qapi_files.to_list()) diff --git a/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c similarity index 100% rename from qemu-storage-daemon.c rename to storage-daemon/qemu-storage-daemon.c --=20 2.26.2