Commit d5cafc73 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Paolo Bonzini
Browse files

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: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 41ac54b2

hw/bt/hci-csr.c

+13 −6
Original line number Diff line number Diff line
@@ -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;

}