From nobody Mon Feb 9 23:03:06 2026 Delivered-To: importer@patchew.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=1597682951; cv=none; d=zohomail.com; s=zohoarc; b=FSe8eytN3cPTwvwdLMbSYUVEBSjz/svEjQHWkbaFuehXU1/wH5kgIrp3cgPOMXGq0YXQBFVQ3QpGRQR3TcN0V0JlRKP87iUZaKCcWd5EenSbKruhsHjFHDPinkFJac7lyzwWdMHHZepLl7lzaOKFOg6j4EepSqG+2GkrslQD1iM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597682951; h=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=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=dmRsTISVai164Rb9InGEtkqC7kwL3WtMhQX+NZ6dc8KeLB0jHldBTJDEisaWmsCGbtE+90RRQWPWQfa4c7G5xWoD2YUgA/RwX9dM8DKy7BZK8WkMVErzLmFCuP6mArBBYn8xVB0CWuN2VI7weSyYlD/2Yl/EZmP6H8hsyoF+hrc= 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 1597682951847166.6558830373408; Mon, 17 Aug 2020 09:49:11 -0700 (PDT) Received: from localhost ([::1]:42142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k7gtY-00010D-E3 for importer@patchew.org; Mon, 17 Aug 2020 11:17:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k7gHc-0005M0-DS for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:44 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k7gHa-0006Fn-Lm for qemu-devel@nongnu.org; Mon, 17 Aug 2020 10:38:44 -0400 Received: by mail-wr1-x443.google.com with SMTP id r2so15269262wrs.8 for ; Mon, 17 Aug 2020 07:38:42 -0700 (PDT) Received: from donizetti.redhat.com ([2001:b07:6468:f312:a0d1:fc42:c610:f977]) by smtp.gmail.com with ESMTPSA id i22sm34966603wrb.45.2020.08.17.07.38.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 07:38:40 -0700 (PDT) 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=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=VyZ/NyjtdT2xpMVT3eoqy3Bmg3wmdFW3tmQhxFbPlj1oWYSWZGcTFUGcrtBGw5AY5M rwg2fLA6u8ACLXlJ+Xjdul0w4FfE9Kd6m8GvB7mTFgBMN8R0oORhKE0xZOGXipgKDQoQ cZ9b88uUXSwxhOAfOJOBMWktlRV3KMOkW45iExtMoAxzNeXvUKCJnO3Rfzzi34YyCqX2 QIMN7rS+hHBUsue4rewT/loz+vDDQcrHYXdNcmfDuMH9jw6UX9TXnm0Yl47hx/Rix2VV yHqXkcVrEVVwVx8c2CHJ3aVrAGnh4SEiYdH99+42CPjnsJdWn4oG+wifN8n3VeirhX31 c5pg== 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=fLQDRD2mwQArCUub7+cO8guKcXQpbRORxQdypC9xSvQ=; b=S/gEhDX6OiKjFE99WdDcWJWrfLklCOJG29IT2KmR6nvGUGXYL5Z6ME6BCsy/2ObTaJ LluWjMBti6gv5D1Y9US85Wg52iivt3c1GqoGBVfc931Hu+uE+pvqG4aleapOslIsNvf/ 1F9zdlLsIzNc6yOV2htg/eSZpMiO3874uOj/UwnhSPzAtUbRFLAZB8LJKYsLHoN/Lqjs p8wBRiqafsZCbZW4nmUE1zs00ZeLS5paQjZAchJObM8Un8iIU89Oi2Cqqt29EAbxKE3Z yTY/Uz78CgshwYVAu6E7KcorHxo8gca0kbn0MaaTf/UXRGMOLi6gUlCZd1pO+jieNAuY OnGA== X-Gm-Message-State: AOAM533XJ/L2iJBYN+X+iVbvQckkM3g6kOy3Y8pQbP1ZYbapanMgqvSA yA6gby/9sGIIwOIxCyv7TRbkAhFy06A= X-Google-Smtp-Source: ABdhPJwQ/CmzJ3BPg7tkhrDp9tHJV50I5i9u/u/j1YZLZ6211kP7HxTKB/9mHvFiua93rQXYahqH3g== X-Received: by 2002:adf:c401:: with SMTP id v1mr15102930wrf.379.1597675121024; Mon, 17 Aug 2020 07:38:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 076/150] meson: convert qemu-storage-daemon Date: Mon, 17 Aug 2020 16:36:09 +0200 Message-Id: <20200817143723.343284-77-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200817143723.343284-1-pbonzini@redhat.com> References: <20200817143723.343284-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::443; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no 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: fail (Header signature does not verify) 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 135175c5ef..a523898da0 100644 --- a/Makefile +++ b/Makefile @@ -168,8 +168,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 @@ -185,7 +183,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) @@ -276,8 +273,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 d7d10cbbaf..cae4b2dce2 100644 --- a/meson.build +++ b/meson.build @@ -586,7 +586,6 @@ subdir('util') subdir('qom') subdir('authz') subdir('crypto') -subdir('storage-daemon') subdir('ui') =20 =20 @@ -796,6 +795,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