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=-8.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 A525BC282DD for ; Mon, 10 Jun 2019 11:24:21 +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 2FE5D206BB for ; Mon, 10 Jun 2019 11:24:20 +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="d3lQy6AW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FE5D206BB 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]:44580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haIPU-0006HM-6k for qemu-devel@archiver.kernel.org; Mon, 10 Jun 2019 07:24:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43061) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haIGd-00074O-Ij for qemu-devel@nongnu.org; Mon, 10 Jun 2019 07:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haIGc-0000Wi-Bf for qemu-devel@nongnu.org; Mon, 10 Jun 2019 07:15:11 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1haIGc-0000UF-4Q for qemu-devel@nongnu.org; Mon, 10 Jun 2019 07:15:10 -0400 Received: by mail-wr1-x444.google.com with SMTP id n4so8771568wrs.3 for ; Mon, 10 Jun 2019 04:15:10 -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; bh=ElZKCGuiZjv0T7oDmrIXGv2pOxAvcOLWWjOt4Xe9G90=; b=d3lQy6AW9hzOkwduoPZmT5mDb5MwZv7XIGUnTP7I43BJ5iOm77/Zxw9xS8N9lBgBJM /AHVxlxnTvCixGnYa+hxZ99vhiPeRXwDKvhs2tu23IHWPNrrjjszhiGO1yzdSAOcVz0N ubttsNLukYlT4HFjBgNk7Y1t2Am0kualo/Yu9Vt0hWWEXhd9JR6YX4mRn2BBxho+ptup 7Da+lLNPuUUnwOfWhkJlYgYtJw1yocteXRnEZFvtCDgZKPhFZvAPQDogpeZMYKAzybWr ZcIEN1sVJIjd8uSgxG9fchiPaGjOX9/Egu3GgsWQa/DsHk4NqP9tK/XpBupHMYk4HLZl qT2w== 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; bh=ElZKCGuiZjv0T7oDmrIXGv2pOxAvcOLWWjOt4Xe9G90=; b=QHldLZ2eiXDSkD7uCzX3hhospRWylNJbgBDeiJX3w/yf64j14faqg55ADqDUFw5lSi 7gJCV3xBWpcQofGVJCKQ2lXmUYZNfGPg7LhXNXN58m4h74ZHqAUIKoB60QzQRqLRHUbP l6lYYkxdm+NN7B73Et5lOrMBi9FcGkQutZPeNQ0qktwnel7pySZs0E38BOx8+XHwXtlr TZapf3twbdti+sCIqehCusRauAemw0bdcgyrGZFHXHUmYAsfO528akrx1aiSyWktPEV/ 4IbGA+uvDci3YNPTL+MTpQQz71nXxvgXHVY7aD7AHflj1Qo//EFjwihGPBKIzz5QVFjF qbwg== X-Gm-Message-State: APjAAAV/r3UJy8qDzFOgKugpB3JunzNhmM8h2B7Hd609S1sSQo68oyrU y2gVWGkmALZp6tvXp4Mv2CY98hUX X-Google-Smtp-Source: APXvYqzl7MyzzUVZz2eH0I6jiJmkgbFV9oZYmQ1uOoDbZaP1H5ARpP7+Or75Jp8rWA0uzGob32rU2Q== X-Received: by 2002:a5d:4e83:: with SMTP id e3mr11137394wru.263.1560165308741; Mon, 10 Jun 2019 04:15:08 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u13sm11934414wrq.62.2019.06.10.04.15.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Jun 2019 04:15:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 10 Jun 2019 13:14:58 +0200 Message-Id: <1560165301-39026-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1560165301-39026-1-git-send-email-pbonzini@redhat.com> References: <1560165301-39026-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 4/7] libvhost-user: convert to Meson 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" Because libqemuutil.a is not converted yet, selected files have to be compiled twice, once with Meson and once with Makefile.objs. Apart from this the conversion is straightforward. Signed-off-by: Paolo Bonzini --- Makefile | 10 ++++------ Makefile.objs | 1 - contrib/libvhost-user/Makefile.objs | 1 - contrib/libvhost-user/meson.build | 7 +++++++ meson.build | 2 ++ 5 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 contrib/libvhost-user/Makefile.objs create mode 100644 contrib/libvhost-user/meson.build diff --git a/Makefile b/Makefile index b8f802c..6a3461e 100644 --- a/Makefile +++ b/Makefile @@ -426,7 +426,6 @@ dummy := $(call unnest-vars,, \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ rdmacm-mux-obj-y \ - libvhost-user-obj-y \ vhost-user-scsi-obj-y \ vhost-user-blk-obj-y \ vhost-user-input-obj-y \ @@ -529,7 +528,6 @@ Makefile: $(version-obj-y) # Build libraries libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) -libvhost-user.a: $(libvhost-user-obj-y) $(util-obj-y) $(stub-obj-y) ###################################################################### @@ -632,21 +630,21 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS) $(call LINK, $^) endif -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) contrib/libvhost-user/libvhost-user.a $(call LINK, $^) -vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a +vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) contrib/libvhost-user/libvhost-user.a $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) $(call LINK, $^) -vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) $(libvhost-user-obj-y) libqemuutil.a libqemustub.a +vhost-user-gpu$(EXESUF): $(vhost-user-gpu-obj-y) contrib/libvhost-user/libvhost-user.a $(call LINK, $^) ifdef CONFIG_VHOST_USER_INPUT ifdef CONFIG_LINUX -vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) libvhost-user.a libqemuutil.a +vhost-user-input$(EXESUF): $(vhost-user-input-obj-y) contrib/libvhost-user/libvhost-user.a $(COMMON_LDADDS) $(call LINK, $^) # build by default, do not install diff --git a/Makefile.objs b/Makefile.objs index c8337fa..4f2fa6a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -116,7 +116,6 @@ qga-vss-dll-obj-y = qga/ elf2dmp-obj-y = contrib/elf2dmp/ ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/ ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/ -libvhost-user-obj-y = contrib/libvhost-user/ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ diff --git a/contrib/libvhost-user/Makefile.objs b/contrib/libvhost-user/Makefile.objs deleted file mode 100644 index ef3778e..0000000 --- a/contrib/libvhost-user/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -libvhost-user-obj-y += libvhost-user.o libvhost-user-glib.o diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meson.build new file mode 100644 index 0000000..7ef610a --- /dev/null +++ b/contrib/libvhost-user/meson.build @@ -0,0 +1,7 @@ +libvhost_user = static_library('vhost-user', + [files('libvhost-user.c', 'libvhost-user-glib.c'), + meson.source_root() / 'stubs/error-printf.c', + meson.source_root() / 'stubs/monitor.c', + meson.source_root() / 'util/error.c', + meson.source_root() / 'util/qemu-error.c', + meson.source_root() / 'util/memfd.c']) diff --git a/meson.build b/meson.build index b683d70..a6748f9 100644 --- a/meson.build +++ b/meson.build @@ -7,3 +7,5 @@ add_project_arguments(config_host['QEMU_CFLAGS'].split(), language: 'c') add_project_arguments(config_host['QEMU_INCLUDES'].split(), language: 'c') + +subdir('contrib/libvhost-user') -- 1.8.3.1