From nobody Mon Apr 29 21:46:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490968487270687.543163157601; Fri, 31 Mar 2017 06:54:47 -0700 (PDT) Received: from localhost ([::1]:41208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctx0n-0008UP-K8 for importer@patchew.org; Fri, 31 Mar 2017 09:54:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctwyj-0007HM-IY for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctwyg-0000o5-Vc for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:52:37 -0400 Received: from 3.mo179.mail-out.ovh.net ([178.33.251.175]:39974) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ctwyg-0000nm-OU for qemu-devel@nongnu.org; Fri, 31 Mar 2017 09:52:34 -0400 Received: from player755.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id 0E5F23422B for ; Fri, 31 Mar 2017 15:52:32 +0200 (CEST) Received: from bahia.lan (huguette.tetaneutral.net [91.224.149.27]) (Authenticated sender: groug@kaod.org) by player755.ha.ovh.net (Postfix) with ESMTPA id 876C226009F; Fri, 31 Mar 2017 15:52:26 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Fri, 31 Mar 2017 15:52:23 +0200 Message-ID: <149096834395.26958.7919143982719167728.stgit@bahia.lan> User-Agent: StGit/0.17.1-20-gc0b1b-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 6854478635082226171 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelhedrledugdeilecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.33.251.175 Subject: [Qemu-devel] [for-2.10 PATCH] fsdev: move stub to libqemustub.a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Greg Kurz , Pradeep Jagadeesh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 The qemu_fsdev_add() stub is used by targets that don't build VirtFS, like CRIS for example. This can be handled by libqemustub.a. Signed-off-by: Greg Kurz --- fsdev/Makefile.objs | 6 ------ fsdev/qemu-fsdev-dummy.c | 21 --------------------- stubs/Makefile.objs | 1 + stubs/qemu-fsdev-dummy.c | 21 +++++++++++++++++++++ 4 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 fsdev/qemu-fsdev-dummy.c create mode 100644 stubs/qemu-fsdev-dummy.c diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs index 659df6e18767..e2eea86d680a 100644 --- a/fsdev/Makefile.objs +++ b/fsdev/Makefile.objs @@ -2,11 +2,5 @@ ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. common-obj-y =3D qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o -else -common-obj-y =3D qemu-fsdev-dummy.o endif common-obj-y +=3D qemu-fsdev-opts.o qemu-fsdev-throttle.o - -# Toplevel always builds this; targets without virtio will put it in -# common-obj-y -common-obj-$(CONFIG_ALL) +=3D qemu-fsdev-dummy.o diff --git a/fsdev/qemu-fsdev-dummy.c b/fsdev/qemu-fsdev-dummy.c deleted file mode 100644 index 6dc0fbc4c402..000000000000 --- a/fsdev/qemu-fsdev-dummy.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * 9p - * - * Copyright IBM, Corp. 2010 - * - * Authors: - * Gautham R Shenoy - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - * - */ -#include "qemu/osdep.h" -#include "qemu-fsdev.h" -#include "qemu/config-file.h" -#include "qemu/module.h" - -int qemu_fsdev_add(QemuOpts *opts) -{ - return 0; -} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 224f04ba6970..f67943da20e9 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -37,3 +37,4 @@ stub-obj-y +=3D target-monitor-defs.o stub-obj-y +=3D target-get-monitor-def.o stub-obj-y +=3D pc_madt_cpu_entry.o stub-obj-y +=3D vmgenid.o +stub-obj-$(CONFIG_VIRTFS) +=3D qemu-fsdev-dummy.o diff --git a/stubs/qemu-fsdev-dummy.c b/stubs/qemu-fsdev-dummy.c new file mode 100644 index 000000000000..12f2be21f915 --- /dev/null +++ b/stubs/qemu-fsdev-dummy.c @@ -0,0 +1,21 @@ +/* + * 9p + * + * Copyright IBM, Corp. 2010 + * + * Authors: + * Gautham R Shenoy + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ +#include "qemu/osdep.h" +#include "fsdev/qemu-fsdev.h" +#include "qemu/config-file.h" +#include "qemu/module.h" + +int qemu_fsdev_add(QemuOpts *opts) +{ + return 0; +}