[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/41] bt: use qemu_chr_alloc()
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 32/41] bt: use qemu_chr_alloc() |
Date: |
Fri, 27 Jan 2017 14:45:40 +0100 |
From: Marc-André Lureau <address@hidden>
Use common allocator for CharDriverState.
Rename the now untouched parent field.
The casts added are temporary, they are replaced with QOM type-safe
macros in a later patch in this series.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/bt/hci-csr.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index bf2deb0..e2c78b8 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -26,9 +26,10 @@
#include "hw/irq.h"
#include "sysemu/bt.h"
#include "hw/bt.h"
+#include "qapi/error.h"
struct csrhci_s {
- CharDriverState chr;
+ CharDriverState parent;
int enable;
qemu_irq *pins;
int pin_state;
@@ -78,7 +79,8 @@ enum {
static inline void csrhci_fifo_wake(struct csrhci_s *s)
{
- CharBackend *be = s->chr.be;
+ CharDriverState *chr = (CharDriverState *)s;
+ CharBackend *be = chr->be;
if (!s->enable || !s->out_len)
return;
@@ -468,10 +470,15 @@ CharDriverState *uart_hci_init(void)
.chr_write = csrhci_write,
.chr_ioctl = csrhci_ioctl,
};
- struct csrhci_s *s = (struct csrhci_s *)
- g_malloc0(sizeof(struct csrhci_s));
+ Error *err = NULL;
+ ChardevCommon common = { 0, };
+ CharDriverState *chr = qemu_chr_alloc(&hci_driver, &common, &err);
+ struct csrhci_s *s = (struct csrhci_s *)chr;
- s->chr.driver = &hci_driver;
+ if (err) {
+ error_report_err(err);
+ return NULL;
+ }
s->hci = qemu_next_hci();
s->hci->opaque = s;
@@ -482,5 +489,5 @@ CharDriverState *uart_hci_init(void)
s->pins = qemu_allocate_irqs(csrhci_pins, s, __csrhci_pins);
csrhci_reset(s);
- return &s->chr;
+ return chr;
}
--
1.8.3.1
- [Qemu-devel] [PULL 23/41] char: add qemu_chr_fe_add_watch() Returns description, (continued)
- [Qemu-devel] [PULL 23/41] char: add qemu_chr_fe_add_watch() Returns description, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 20/41] block/iscsi: statically link qemu_iscsi_opts, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 24/41] doc: fix spelling, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 21/41] tests: fix linking test-char on win32, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 26/41] char: use a static array for backends, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 25/41] char: use a const CharDriver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 22/41] qemu-options: stdio is available on win32, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 28/41] char: fold single-user functions in caller, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 30/41] char: use a feature bit for replay, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 29/41] char: introduce generic qemu_chr_get_kind(), Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 32/41] bt: use qemu_chr_alloc(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 27/41] char: move callbacks in CharDriver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 35/41] spice-char: improve error reporting, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 37/41] gtk: overwrite the console.c char driver, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 34/41] char: rename TCPChardev and NetChardev, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 38/41] baum: use a common prefix for chr callbacks, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 36/41] char: use error_report(), Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 31/41] char: allocate CharDriverState as a single object, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 39/41] vc: use a common prefix for chr callbacks, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 41/41] memory: don't sign-extend 32-bit writes, Paolo Bonzini, 2017/01/27
- [Qemu-devel] [PULL 33/41] char: rename CharDriverState Chardev, Paolo Bonzini, 2017/01/27