qemu-char: move baum registration to baum.c
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Amit Shah <amit.shah@redhat.com> Message-id: 1b24baa1ec3a174d5cad31e079d829904b53077b.1362505276.git.amit.shah@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
26c6061452
commit
08744c9811
|
@ -562,7 +562,7 @@ static void baum_close(struct CharDriverState *chr)
|
||||||
g_free(baum);
|
g_free(baum);
|
||||||
}
|
}
|
||||||
|
|
||||||
CharDriverState *chr_baum_init(QemuOpts *opts)
|
static CharDriverState *chr_baum_init(QemuOpts *opts)
|
||||||
{
|
{
|
||||||
BaumDriverState *baum;
|
BaumDriverState *baum;
|
||||||
CharDriverState *chr;
|
CharDriverState *chr;
|
||||||
|
@ -625,3 +625,10 @@ fail_handle:
|
||||||
g_free(baum);
|
g_free(baum);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void register_types(void)
|
||||||
|
{
|
||||||
|
register_char_driver("braille", chr_baum_init);
|
||||||
|
}
|
||||||
|
|
||||||
|
type_init(register_types);
|
||||||
|
|
30
hw/baum.h
30
hw/baum.h
|
@ -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
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#include "char/char.h"
|
#include "char/char.h"
|
||||||
#include "hw/usb.h"
|
#include "hw/usb.h"
|
||||||
#include "hw/baum.h"
|
|
||||||
#include "hw/msmouse.h"
|
#include "hw/msmouse.h"
|
||||||
#include "qmp-commands.h"
|
#include "qmp-commands.h"
|
||||||
|
|
||||||
|
@ -3678,9 +3677,6 @@ static void register_types(void)
|
||||||
register_char_driver("pipe", qemu_chr_open_pipe);
|
register_char_driver("pipe", qemu_chr_open_pipe);
|
||||||
register_char_driver("stdio", qemu_chr_open_stdio);
|
register_char_driver("stdio", qemu_chr_open_stdio);
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_BRLAPI
|
|
||||||
register_char_driver("braille", chr_baum_init);
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_CHARDEV_TTY
|
#ifdef HAVE_CHARDEV_TTY
|
||||||
register_char_driver("tty", qemu_chr_open_tty);
|
register_char_driver("tty", qemu_chr_open_tty);
|
||||||
register_char_driver("serial", qemu_chr_open_tty);
|
register_char_driver("serial", qemu_chr_open_tty);
|
||||||
|
|
1
vl.c
1
vl.c
|
@ -119,7 +119,6 @@ int main(int argc, char **argv)
|
||||||
#include "hw/pcmcia.h"
|
#include "hw/pcmcia.h"
|
||||||
#include "hw/pc.h"
|
#include "hw/pc.h"
|
||||||
#include "hw/isa.h"
|
#include "hw/isa.h"
|
||||||
#include "hw/baum.h"
|
|
||||||
#include "hw/bt.h"
|
#include "hw/bt.h"
|
||||||
#include "hw/watchdog.h"
|
#include "hw/watchdog.h"
|
||||||
#include "hw/smbios.h"
|
#include "hw/smbios.h"
|
||||||
|
|
Loading…
Reference in a new issue