From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Greg Kurz <groug@kaod.org>,
Pradeep Jagadeesh <pradeep.jagadeesh@huawei.com>
Subject: [Qemu-devel] [for-2.10 PATCH] fsdev: move stub to libqemustub.a
Date: Fri, 31 Mar 2017 15:52:23 +0200 [thread overview]
Message-ID: <149096834395.26958.7919143982719167728.stgit@bahia.lan> (raw)
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 <groug@kaod.org>
---
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 = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
-else
-common-obj-y = qemu-fsdev-dummy.o
endif
common-obj-y += 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) += 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 <ego@in.ibm.com>
- *
- * 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 += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += vmgenid.o
+stub-obj-$(CONFIG_VIRTFS) += 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 <ego@in.ibm.com>
+ *
+ * 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;
+}
next reply other threads:[~2017-03-31 13:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-31 13:52 Greg Kurz [this message]
2017-03-31 14:06 ` [Qemu-devel] [for-2.10 PATCH] fsdev: move stub to libqemustub.a Paolo Bonzini
2017-03-31 16:46 ` Greg Kurz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=149096834395.26958.7919143982719167728.stgit@bahia.lan \
--to=groug@kaod.org \
--cc=pbonzini@redhat.com \
--cc=pradeep.jagadeesh@huawei.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.