Patchwork [17/20] qemu-char: move text console init to console.c

login
register
mail settings
Submitter Amit Shah
Date March 5, 2013, 5:51 p.m.
Message ID <17cefde0a8d7807294bab95e93c3328a20d3f2ed.1362505276.git.amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/225132/
State New
Headers show

Comments

Amit Shah - March 5, 2013, 5:51 p.m.
From: Anthony Liguori <aliguori@us.ibm.com>

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 qemu-char.c  | 1 -
 ui/console.c | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
Anthony Liguori - March 13, 2013, 5:19 p.m.
Amit Shah <amit.shah@redhat.com> writes:

> From: Anthony Liguori <aliguori@us.ibm.com>
>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> Signed-off-by: Amit Shah <amit.shah@redhat.com>

This patch broke vc switching in GTK.

> ---
>  qemu-char.c  | 1 -
>  ui/console.c | 7 +++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index cf02cab..b82d643 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -3663,7 +3663,6 @@ static void register_types(void)
>      register_char_driver("null", qemu_chr_open_null);
>      register_char_driver("socket", qemu_chr_open_socket);
>      register_char_driver("udp", qemu_chr_open_udp);
> -    register_char_driver("vc", vc_init);
>      register_char_driver("memory", qemu_chr_open_ringbuf);
>  #ifdef _WIN32
>      register_char_driver("file", qemu_chr_open_win_file_out);
> diff --git a/ui/console.c b/ui/console.c
> index 0d95f32..83a6fa3 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -1739,3 +1739,10 @@ PixelFormat qemu_default_pixelformat(int bpp)
>      }
>      return pf;
>  }
> +
> +static void register_types(void)
> +{
> +    register_char_driver("vc", text_console_init);

This should be:

       register_char_driver("vc", vc_init);

Patch on the way...

Regards,

Anthony Liguori

> +}
> +
> +type_init(register_types);
> -- 
> 1.8.1.2

Patch

diff --git a/qemu-char.c b/qemu-char.c
index cf02cab..b82d643 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -3663,7 +3663,6 @@  static void register_types(void)
     register_char_driver("null", qemu_chr_open_null);
     register_char_driver("socket", qemu_chr_open_socket);
     register_char_driver("udp", qemu_chr_open_udp);
-    register_char_driver("vc", vc_init);
     register_char_driver("memory", qemu_chr_open_ringbuf);
 #ifdef _WIN32
     register_char_driver("file", qemu_chr_open_win_file_out);
diff --git a/ui/console.c b/ui/console.c
index 0d95f32..83a6fa3 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1739,3 +1739,10 @@  PixelFormat qemu_default_pixelformat(int bpp)
     }
     return pf;
 }
+
+static void register_types(void)
+{
+    register_char_driver("vc", text_console_init);
+}
+
+type_init(register_types);