From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-block@nongnu.org, Julia Suvorova <jusual@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>,
Aarushi Mehta <mehta.aaru20@gmail.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PULL 08/18] stubs: add stubs for io_uring interface
Date: Thu, 30 Jan 2020 21:31:04 +0000 [thread overview]
Message-ID: <20200130213114.325157-9-stefanha@redhat.com> (raw)
In-Reply-To: <20200130213114.325157-1-stefanha@redhat.com>
From: Aarushi Mehta <mehta.aaru20@gmail.com>
Follow linux-aio.o and stub out the block/io_uring.o APIs that will be
missing when a binary is linked with obj-util-y but without
block-util-y (e.g. vhost-user-gpu).
For example, the stubs are necessary so that a binary using util/async.o
from obj-util-y for qemu_bh_new() links successfully. In this case
block/io_uring.o from block-util-y isn't needed and we can avoid
dragging in the block layer by linking the stubs instead. The stub
functions never get called.
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200120141858.587874-6-stefanha@redhat.com
Message-Id: <20200120141858.587874-6-stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
MAINTAINERS | 1 +
stubs/Makefile.objs | 1 +
stubs/io_uring.c | 32 ++++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 100644 stubs/io_uring.c
diff --git a/MAINTAINERS b/MAINTAINERS
index a19437c13d..4ceb1ad882 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2641,6 +2641,7 @@ M: Stefan Hajnoczi <stefanha@redhat.com>
L: qemu-block@nongnu.org
S: Maintained
F: block/io_uring.c
+F: stubs/io_uring.c
qcow2
M: Kevin Wolf <kwolf@redhat.com>
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 8b0ff25508..7afbe5fb61 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -13,6 +13,7 @@ stub-obj-y += iothread.o
stub-obj-y += iothread-lock.o
stub-obj-y += is-daemonized.o
stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
+stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o
stub-obj-y += machine-init-done.o
stub-obj-y += migr-blocker.o
stub-obj-y += change-state-handler.o
diff --git a/stubs/io_uring.c b/stubs/io_uring.c
new file mode 100644
index 0000000000..622d1e4648
--- /dev/null
+++ b/stubs/io_uring.c
@@ -0,0 +1,32 @@
+/*
+ * Linux io_uring support.
+ *
+ * Copyright (C) 2009 IBM, Corp.
+ * Copyright (C) 2009 Red Hat, Inc.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include "qemu/osdep.h"
+#include "block/aio.h"
+#include "block/raw-aio.h"
+
+void luring_detach_aio_context(LuringState *s, AioContext *old_context)
+{
+ abort();
+}
+
+void luring_attach_aio_context(LuringState *s, AioContext *new_context)
+{
+ abort();
+}
+
+LuringState *luring_init(Error **errp)
+{
+ abort();
+}
+
+void luring_cleanup(LuringState *s)
+{
+ abort();
+}
--
2.24.1
next prev parent reply other threads:[~2020-01-30 21:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 21:30 [PULL 00/18] Block patches Stefan Hajnoczi
2020-01-30 21:30 ` [PULL 01/18] block: eliminate BDRV_REQ_NO_SERIALISING Stefan Hajnoczi
2020-01-30 21:30 ` [PULL 02/18] block/io: wait for serialising requests when a request becomes serialising Stefan Hajnoczi
2020-01-30 21:30 ` [PULL 03/18] block/io: take bs->reqs_lock in bdrv_mark_request_serialising Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 04/18] configure: permit use of io_uring Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 05/18] qapi/block-core: add option for io_uring Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 06/18] block/block: add BDRV flag " Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 07/18] block/io_uring: implements interfaces " Stefan Hajnoczi
2020-01-30 21:31 ` Stefan Hajnoczi [this message]
2020-01-30 21:31 ` [PULL 09/18] util/async: add aio " Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 10/18] blockdev: adds bdrv_parse_aio to use io_uring Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 11/18] block/file-posix.c: extend " Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 12/18] block: add trace events for io_uring Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 13/18] block/io_uring: adds userspace completion polling Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 14/18] qemu-io: adds option to use aio engine Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 15/18] qemu-img: adds option to use aio engine for benchmarking Stefan Hajnoczi
2020-02-03 10:55 ` Peter Maydell
2020-02-05 15:55 ` Julia Suvorova
2020-01-30 21:31 ` [PULL 16/18] qemu-nbd: adds option for aio engines Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 17/18] tests/qemu-iotests: enable testing with aio options Stefan Hajnoczi
2020-01-30 21:31 ` [PULL 18/18] tests/qemu-iotests: use AIOMODE with various tests Stefan Hajnoczi
2020-01-31 11:39 ` [PULL 00/18] Block patches Peter Maydell
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=20200130213114.325157-9-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=armbru@redhat.com \
--cc=fam@euphon.net \
--cc=jusual@redhat.com \
--cc=kwolf@redhat.com \
--cc=mehta.aaru20@gmail.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).