From d5cafc733d21167fce7fcc3b45530ecb1f878e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sat, 22 Oct 2016 10:55:22 +0300 Subject: [PATCH] bt: use qemu_chr_alloc() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- 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 bf2deb0497..e2c78b8720 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; }