diff options
| -rw-r--r-- | chardev/Makefile.objs | 1 | ||||
| -rw-r--r-- | chardev/char-null.c | 54 | ||||
| -rw-r--r-- | chardev/char.c | 23 |
3 files changed, 55 insertions, 23 deletions
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index 8bf131b461..be7ff800c3 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1 +1,2 @@ chardev-obj-y += char.o +chardev-obj-y += char-null.o diff --git a/chardev/char-null.c b/chardev/char-null.c new file mode 100644 index 0000000000..dc0d68ab2d --- /dev/null +++ b/chardev/char-null.c @@ -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); diff --git a/chardev/char.c b/chardev/char.c index ee6ceb3471..2ca6c7cf67 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -560,28 +560,6 @@ static const TypeInfo char_type_info = { .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 */ #define MAX_MUX 4 #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_stdio_type_info); #endif - type_register_static(&char_null_type_info); type_register_static(&char_socket_type_info); type_register_static(&char_udp_type_info); type_register_static(&char_ringbuf_type_info); |