ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bt: use qemu_chr_alloc() 

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 <marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2016-10-22 10:55:22 +03:00 committed by Paolo Bonzini
parent 41ac54b253
commit d5cafc733d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/bt/hci-csr.c
View File

@ -26,9 +26,10 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "sysemu/bt.h" #include "sysemu/bt.h"
#include "hw/bt.h" #include "hw/bt.h"
#include "qapi/error.h"
struct csrhci_s { struct csrhci_s {
CharDriverState chr; CharDriverState parent;
int enable; int enable;
qemu_irq *pins; qemu_irq *pins;
int pin_state; int pin_state;
@ -78,7 +79,8 @@ enum {
static inline void csrhci_fifo_wake(struct csrhci_s *s) 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) if (!s->enable || !s->out_len)
return; return;
@ -468,10 +470,15 @@ CharDriverState *uart_hci_init(void)
.chr_write = csrhci_write, .chr_write = csrhci_write,
.chr_ioctl = csrhci_ioctl, .chr_ioctl = csrhci_ioctl,
}; };
struct csrhci_s *s = (struct csrhci_s *) Error *err = NULL;
g_malloc0(sizeof(struct csrhci_s)); 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 = qemu_next_hci();
s->hci->opaque = s; s->hci->opaque = s;
@ -482,5 +489,5 @@ CharDriverState *uart_hci_init(void)
s->pins = qemu_allocate_irqs(csrhci_pins, s, __csrhci_pins); s->pins = qemu_allocate_irqs(csrhci_pins, s, __csrhci_pins);
csrhci_reset(s); csrhci_reset(s);
return &s->chr; return chr;
} }