Patchwork [15/19] qemu-char: move baum registration to baum.c

login
register
mail settings
Submitter Anthony Liguori
Date Feb. 18, 2013, 9:48 p.m.
Message ID <1361224096-21075-16-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/221516/
State New
Headers show

Comments

Anthony Liguori - Feb. 18, 2013, 9:48 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/baum.c   |  9 ++++++++-
 hw/baum.h   | 30 ------------------------------
 qemu-char.c |  4 ----
 vl.c        |  1 -
 4 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 hw/baum.h

Patch

diff --git a/hw/baum.c b/hw/baum.c
index 09dcb9c..d75b150 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -562,7 +562,7 @@  static void baum_close(struct CharDriverState *chr)
     g_free(baum);
 }
 
-CharDriverState *chr_baum_init(QemuOpts *opts)
+static CharDriverState *chr_baum_init(QemuOpts *opts)
 {
     BaumDriverState *baum;
     CharDriverState *chr;
@@ -625,3 +625,10 @@  fail_handle:
     g_free(baum);
     return NULL;
 }
+
+static void register_types(void)
+{
+    register_char_driver("braille", chr_baum_init);
+}
+
+type_init(register_types);
diff --git a/hw/baum.h b/hw/baum.h
deleted file mode 100644
index 7635884..0000000
--- a/hw/baum.h
+++ /dev/null
@@ -1,30 +0,0 @@ 
-/*
- * QEMU Baum
- *
- * Copyright (c) 2008 Samuel Thibault
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef HW_BAUM_H
-#define HW_BAUM_H 1
-
-/* char device */
-CharDriverState *chr_baum_init(QemuOpts *opts);
-
-#endif
diff --git a/qemu-char.c b/qemu-char.c
index 8b4c9a5..14b0111 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -28,7 +28,6 @@ 
 #include "qemu/timer.h"
 #include "char/char.h"
 #include "hw/usb.h"
-#include "hw/baum.h"
 #include "hw/msmouse.h"
 #include "qmp-commands.h"
 
@@ -3669,9 +3668,6 @@  static void register_types(void)
     register_char_driver("pty", qemu_chr_open_pty);
     register_char_driver("stdio", qemu_chr_open_stdio);
 #endif
-#ifdef CONFIG_BRLAPI
-    register_char_driver("braille", chr_baum_init);
-#endif
 #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
     || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \
     || defined(__FreeBSD_kernel__)
diff --git a/vl.c b/vl.c
index c5b0eea..bae494c 100644
--- a/vl.c
+++ b/vl.c
@@ -119,7 +119,6 @@  int main(int argc, char **argv)
 #include "hw/pcmcia.h"
 #include "hw/pc.h"
 #include "hw/isa.h"
-#include "hw/baum.h"
 #include "hw/bt.h"
 #include "hw/watchdog.h"
 #include "hw/smbios.h"