diff options
| author | Marc-André Lureau | 2016-12-07 14:20:22 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2017-01-27 18:07:59 +0100 |
| commit | 0ec7b3e7f21caf6bfde404528928d600b661ea8d (patch) | |
| tree | 85e1a8b7e7234d22b9e7fc4947f89d50f4bcbcfb /backends/testdev.c | |
| parent | bt: use qemu_chr_alloc() (diff) | |
| download | qemu-0ec7b3e7f21caf6bfde404528928d600b661ea8d.tar.gz qemu-0ec7b3e7f21caf6bfde404528928d600b661ea8d.tar.xz qemu-0ec7b3e7f21caf6bfde404528928d600b661ea8d.zip | |
char: rename CharDriverState Chardev
Pick a uniform chardev type name.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'backends/testdev.c')
| -rw-r--r-- | backends/testdev.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/backends/testdev.c b/backends/testdev.c index dfa4fe14a1..268b380cf3 100644 --- a/backends/testdev.c +++ b/backends/testdev.c @@ -30,14 +30,14 @@ #define BUF_SIZE 32 typedef struct { - CharDriverState parent; + Chardev parent; uint8_t in_buf[32]; int in_buf_used; -} TestdevCharState; +} TestdevChardev; /* Try to interpret a whole incoming packet */ -static int testdev_eat_packet(TestdevCharState *testdev) +static int testdev_eat_packet(TestdevChardev *testdev) { const uint8_t *cur = testdev->in_buf; int len = testdev->in_buf_used; @@ -78,9 +78,9 @@ static int testdev_eat_packet(TestdevCharState *testdev) } /* The other end is writing some data. Store it and try to interpret */ -static int testdev_write(CharDriverState *chr, const uint8_t *buf, int len) +static int testdev_write(Chardev *chr, const uint8_t *buf, int len) { - TestdevCharState *testdev = (TestdevCharState *)chr; + TestdevChardev *testdev = (TestdevChardev *)chr; int tocopy, eaten, orig_len = len; while (len) { @@ -103,15 +103,15 @@ static int testdev_write(CharDriverState *chr, const uint8_t *buf, int len) return orig_len; } -static CharDriverState *chr_testdev_init(const CharDriver *driver, - const char *id, - ChardevBackend *backend, - ChardevReturn *ret, - bool *be_opened, - Error **errp) +static Chardev *chr_testdev_init(const CharDriver *driver, + const char *id, + ChardevBackend *backend, + ChardevReturn *ret, + bool *be_opened, + Error **errp) { - TestdevCharState *testdev = g_new0(TestdevCharState, 1);; - CharDriverState *chr = (CharDriverState *)testdev; + TestdevChardev *testdev = g_new0(TestdevChardev, 1);; + Chardev *chr = (Chardev *)testdev; chr->driver = driver; @@ -121,7 +121,7 @@ static CharDriverState *chr_testdev_init(const CharDriver *driver, static void register_types(void) { static const CharDriver driver = { - .instance_size = sizeof(TestdevCharState), + .instance_size = sizeof(TestdevChardev), .kind = CHARDEV_BACKEND_KIND_TESTDEV, .create = chr_testdev_init, .chr_write = testdev_write, |