qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 5/8] console: add ability to wrap a console.
Date: Tue, 10 Dec 2013 14:05:55 +1000	[thread overview]
Message-ID: <1386648358-25892-6-git-send-email-airlied@gmail.com> (raw)
In-Reply-To: <1386648358-25892-1-git-send-email-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

In order to implement virtio-vga on top of virtio-gpu we need
to be able to wrap the first console virtio-gpu registers from
inside virtio-vga which initialises after virtio-gpu. With this
interface virtio-vga can store the virtio-gpu interfaces, and
call them from its own ones.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 include/ui/console.h |  7 +++++++
 ui/console.c         | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/include/ui/console.h b/include/ui/console.h
index f6e8957..2ad9238 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -285,6 +285,13 @@ QemuConsole *graphic_console_init(DeviceState *dev,
                                   const GraphicHwOps *ops,
                                   void *opaque);
 
+void graphic_console_wrap(QemuConsole *con,
+			  DeviceState *dev,
+			  const GraphicHwOps *ops,
+			  void *opaque,
+                          const GraphicHwOps **orig_ops,
+                          void **orig_opaque);
+
 void graphic_hw_update(QemuConsole *con);
 void graphic_hw_invalidate(QemuConsole *con);
 void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata);
diff --git a/ui/console.c b/ui/console.c
index def11ea..f2d6721 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1619,6 +1619,19 @@ QemuConsole *graphic_console_init(DeviceState *dev,
     return s;
 }
 
+void graphic_console_wrap(QemuConsole *con,
+			  DeviceState *dev,
+			  const GraphicHwOps *hw_ops,
+			  void *opaque,
+                          const GraphicHwOps **orig_ops,
+                          void **orig_opaque)
+{
+    *orig_opaque = con->hw;
+    *orig_ops = con->hw_ops;
+    con->hw_ops = hw_ops;
+    con->hw = opaque;
+}
+
 QemuConsole *qemu_console_lookup_by_index(unsigned int index)
 {
     if (index >= MAX_CONSOLES) {
-- 
1.8.3.1

  parent reply	other threads:[~2013-12-10  4:06 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-10  4:05 [Qemu-devel] [RFC] sdl2 + virtio-gpu repost Dave Airlie
2013-12-10  4:05 ` [Qemu-devel] [PATCH 1/8] ui/sdl2 : initial port to SDL 2.0 (v2.0) Dave Airlie
2013-12-10 14:35   ` Gerd Hoffmann
2013-12-11  1:12     ` Dave Airlie
2013-12-12 12:53       ` Gerd Hoffmann
2013-12-10  4:05 ` [Qemu-devel] [PATCH 2/8] console: add state notifiers for ui<->display Dave Airlie
2013-12-10  4:05 ` [Qemu-devel] [PATCH 3/8] sdl2: add display notify change support Dave Airlie
2013-12-10  4:05 ` [Qemu-devel] [PATCH 4/8] sdl2: add UI to toggle head 1 on/off Dave Airlie
2013-12-10  4:05 ` Dave Airlie [this message]
2013-12-10  4:05 ` [Qemu-devel] [PATCH 6/8] virtio-gpu: v0.2 of the virtio based GPU code Dave Airlie
2013-12-10  4:05 ` [Qemu-devel] [PATCH 7/8] virtio-vga: v1 Dave Airlie
2013-12-10  4:05 ` [Qemu-devel] [PATCH 8/8] HACK: just to make things start easier with libvirt Dave Airlie
2013-12-10  4:58 ` [Qemu-devel] [RFC] sdl2 + virtio-gpu repost Dave Airlie
2013-12-10  5:42 ` Stefan Weil
2013-12-10 14:24   ` Gerd Hoffmann

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=1386648358-25892-6-git-send-email-airlied@gmail.com \
    --to=airlied@gmail.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 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).