OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

char: move null chardev to its own file

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-12-12 14:43:10 +03:00
parent eb314a9497
commit 247c92af2b
3 changed files with 55 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chardev/Makefile.objs
View File

@ -1 +1,2 @@
chardev-obj-y += char.o chardev-obj-y += char.o
chardev-obj-y += char-null.o

54
chardev/char-null.c Normal file
View File

@ -0,0 +1,54 @@
/*
* QEMU System Emulator
*
* Copyright (c) 2003-2008 Fabrice Bellard
*
* 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.
*/
#include "qemu/osdep.h"
#include "sysemu/char.h"
static void null_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
*be_opened = false;
}
static void char_null_class_init(ObjectClass *oc, void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
cc->open = null_chr_open;
}
static const TypeInfo char_null_type_info = {
.name = TYPE_CHARDEV_NULL,
.parent = TYPE_CHARDEV,
.instance_size = sizeof(Chardev),
.class_init = char_null_class_init,
};
static void register_types(void)
{
type_register_static(&char_null_type_info);
}
type_init(register_types);

23
chardev/char.c
View File

@ -560,28 +560,6 @@ static const TypeInfo char_type_info = {
.class_init = char_class_init, .class_init = char_class_init,
}; };
static void null_chr_open(Chardev *chr,
ChardevBackend *backend,
bool *be_opened,
Error **errp)
{
*be_opened = false;
}
static void char_null_class_init(ObjectClass *oc, void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
cc->open = null_chr_open;
}
static const TypeInfo char_null_type_info = {
.name = TYPE_CHARDEV_NULL,
.parent = TYPE_CHARDEV,
.instance_size = sizeof(Chardev),
.class_init = char_null_class_init,
};
/* MUX driver for serial I/O splitting */ /* MUX driver for serial I/O splitting */
#define MAX_MUX 4 #define MAX_MUX 4
#define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */ #define MUX_BUFFER_SIZE 32 /* Must be a power of 2. */
@ -5105,7 +5083,6 @@ static void register_types(void)
type_register_static(&char_win_type_info); type_register_static(&char_win_type_info);
type_register_static(&char_win_stdio_type_info); type_register_static(&char_win_stdio_type_info);
#endif #endif
type_register_static(&char_null_type_info);
type_register_static(&char_socket_type_info); type_register_static(&char_socket_type_info);
type_register_static(&char_udp_type_info); type_register_static(&char_udp_type_info);
type_register_static(&char_ringbuf_type_info); type_register_static(&char_ringbuf_type_info);