mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
char: replace PROP_CHR with CharBackend
Store the property in a CharBackend instead of CharDriverState*. This also replace systematically chr by chr.chr to access the CharDriverState*. The following patches will replace it with calls to qemu_chr_fe CharBackend functions. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-12-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau
Paolo Bonzini
parent
ecb672d14f
commit
becdfa00cf
37 changed files with 302 additions and 265 deletions
|
|
@ -48,7 +48,7 @@ typedef struct PassthruState PassthruState;
|
|||
|
||||
struct PassthruState {
|
||||
CCIDCardState base;
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
uint8_t vscard_in_data[VSCARD_IN_SIZE];
|
||||
uint32_t vscard_in_pos;
|
||||
uint32_t vscard_in_hdr;
|
||||
|
|
@ -77,9 +77,9 @@ static void ccid_card_vscard_send_msg(PassthruState *s,
|
|||
scr_msg_header.length = htonl(length);
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(s->cs, (uint8_t *)&scr_msg_header,
|
||||
qemu_chr_fe_write_all(s->cs.chr, (uint8_t *)&scr_msg_header,
|
||||
sizeof(VSCMsgHeader));
|
||||
qemu_chr_fe_write_all(s->cs, payload, length);
|
||||
qemu_chr_fe_write_all(s->cs.chr, payload, length);
|
||||
}
|
||||
|
||||
static void ccid_card_vscard_send_apdu(PassthruState *s,
|
||||
|
|
@ -264,7 +264,7 @@ static void ccid_card_vscard_handle_message(PassthruState *card,
|
|||
|
||||
static void ccid_card_vscard_drop_connection(PassthruState *card)
|
||||
{
|
||||
qemu_chr_delete(card->cs);
|
||||
qemu_chr_delete(card->cs.chr);
|
||||
card->vscard_in_pos = card->vscard_in_hdr = 0;
|
||||
}
|
||||
|
||||
|
|
@ -324,7 +324,7 @@ static void passthru_apdu_from_guest(
|
|||
{
|
||||
PassthruState *card = PASSTHRU_CCID_CARD(base);
|
||||
|
||||
if (!card->cs) {
|
||||
if (!card->cs.chr) {
|
||||
printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
|
||||
return;
|
||||
}
|
||||
|
|
@ -345,9 +345,9 @@ static int passthru_initfn(CCIDCardState *base)
|
|||
|
||||
card->vscard_in_pos = 0;
|
||||
card->vscard_in_hdr = 0;
|
||||
if (card->cs) {
|
||||
if (card->cs.chr) {
|
||||
DPRINTF(card, D_INFO, "initing chardev\n");
|
||||
qemu_chr_add_handlers(card->cs,
|
||||
qemu_chr_add_handlers(card->cs.chr,
|
||||
ccid_card_vscard_can_read,
|
||||
ccid_card_vscard_read,
|
||||
ccid_card_vscard_event, card);
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ typedef struct {
|
|||
uint8_t event_trigger;
|
||||
QEMUSerialSetParams params;
|
||||
int latency; /* ms */
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
} USBSerialState;
|
||||
|
||||
#define TYPE_USB_SERIAL "usb-serial-dev"
|
||||
|
|
@ -209,8 +209,10 @@ static uint8_t usb_get_modem_lines(USBSerialState *s)
|
|||
int flags;
|
||||
uint8_t ret;
|
||||
|
||||
if (qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP)
|
||||
if (qemu_chr_fe_ioctl(s->cs.chr,
|
||||
CHR_IOCTL_SERIAL_GET_TIOCM, &flags) == -ENOTSUP) {
|
||||
return FTDI_CTS|FTDI_DSR|FTDI_RLSD;
|
||||
}
|
||||
|
||||
ret = 0;
|
||||
if (flags & CHR_TIOCM_CTS)
|
||||
|
|
@ -260,7 +262,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
case DeviceOutVendor | FTDI_SET_MDM_CTRL:
|
||||
{
|
||||
static int flags;
|
||||
qemu_chr_fe_ioctl(s->cs,CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
|
||||
qemu_chr_fe_ioctl(s->cs.chr, CHR_IOCTL_SERIAL_GET_TIOCM, &flags);
|
||||
if (value & FTDI_SET_RTS) {
|
||||
if (value & FTDI_RTS)
|
||||
flags |= CHR_TIOCM_RTS;
|
||||
|
|
@ -273,7 +275,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
else
|
||||
flags &= ~CHR_TIOCM_DTR;
|
||||
}
|
||||
qemu_chr_fe_ioctl(s->cs,CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
|
||||
qemu_chr_fe_ioctl(s->cs.chr, CHR_IOCTL_SERIAL_SET_TIOCM, &flags);
|
||||
break;
|
||||
}
|
||||
case DeviceOutVendor | FTDI_SET_FLOW_CTRL:
|
||||
|
|
@ -292,7 +294,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
divisor = 1;
|
||||
|
||||
s->params.speed = (48000000 / 2) / (8 * divisor + subdivisor8);
|
||||
qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
qemu_chr_fe_ioctl(s->cs.chr, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
break;
|
||||
}
|
||||
case DeviceOutVendor | FTDI_SET_DATA:
|
||||
|
|
@ -321,7 +323,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p,
|
|||
DPRINTF("unsupported stop bits %d\n", value & FTDI_STOP);
|
||||
goto fail;
|
||||
}
|
||||
qemu_chr_fe_ioctl(s->cs, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
qemu_chr_fe_ioctl(s->cs.chr, CHR_IOCTL_SERIAL_SET_PARAMS, &s->params);
|
||||
/* TODO: TX ON/OFF */
|
||||
break;
|
||||
case DeviceInVendor | FTDI_GET_MDM_ST:
|
||||
|
|
@ -368,7 +370,7 @@ static void usb_serial_handle_data(USBDevice *dev, USBPacket *p)
|
|||
iov = p->iov.iov + i;
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(s->cs, iov->iov_base, iov->iov_len);
|
||||
qemu_chr_fe_write_all(s->cs.chr, iov->iov_base, iov->iov_len);
|
||||
}
|
||||
p->actual_length = p->iov.size;
|
||||
break;
|
||||
|
|
@ -488,7 +490,7 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
|
|||
usb_desc_init(dev);
|
||||
dev->auto_attach = 0;
|
||||
|
||||
if (!s->cs) {
|
||||
if (!s->cs.chr) {
|
||||
error_setg(errp, "Property chardev is required");
|
||||
return;
|
||||
}
|
||||
|
|
@ -499,11 +501,11 @@ static void usb_serial_realize(USBDevice *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read,
|
||||
qemu_chr_add_handlers(s->cs.chr, usb_serial_can_read, usb_serial_read,
|
||||
usb_serial_event, s);
|
||||
usb_serial_handle_reset(dev);
|
||||
|
||||
if (s->cs->be_open && !dev->attached) {
|
||||
if (s->cs.chr->be_open && !dev->attached) {
|
||||
usb_device_attach(dev, &error_abort);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ struct PacketIdQueue {
|
|||
struct USBRedirDevice {
|
||||
USBDevice dev;
|
||||
/* Properties */
|
||||
CharDriverState *cs;
|
||||
CharBackend cs;
|
||||
uint8_t debug;
|
||||
char *filter_str;
|
||||
int32_t bootindex;
|
||||
|
|
@ -285,7 +285,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
|
|||
USBRedirDevice *dev = priv;
|
||||
int r;
|
||||
|
||||
if (!dev->cs->be_open) {
|
||||
if (!dev->cs.chr->be_open) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -294,10 +294,10 @@ static int usbredir_write(void *priv, uint8_t *data, int count)
|
|||
return 0;
|
||||
}
|
||||
|
||||
r = qemu_chr_fe_write(dev->cs, data, count);
|
||||
r = qemu_chr_fe_write(dev->cs.chr, data, count);
|
||||
if (r < count) {
|
||||
if (!dev->watch) {
|
||||
dev->watch = qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP,
|
||||
dev->watch = qemu_chr_fe_add_watch(dev->cs.chr, G_IO_OUT | G_IO_HUP,
|
||||
usbredir_write_unblocked, dev);
|
||||
}
|
||||
if (r < 0) {
|
||||
|
|
@ -1375,7 +1375,7 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
|
|||
USBRedirDevice *dev = USB_REDIRECT(udev);
|
||||
int i;
|
||||
|
||||
if (dev->cs == NULL) {
|
||||
if (dev->cs.chr == NULL) {
|
||||
error_setg(errp, QERR_MISSING_PARAMETER, "chardev");
|
||||
return;
|
||||
}
|
||||
|
|
@ -1406,7 +1406,7 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
|
|||
dev->compatible_speedmask = USB_SPEED_MASK_FULL | USB_SPEED_MASK_HIGH;
|
||||
|
||||
/* Let the backend know we are ready */
|
||||
qemu_chr_add_handlers(dev->cs, usbredir_chardev_can_read,
|
||||
qemu_chr_add_handlers(dev->cs.chr, usbredir_chardev_can_read,
|
||||
usbredir_chardev_read, usbredir_chardev_event, dev);
|
||||
|
||||
qemu_add_vm_change_state_handler(usbredir_vm_state_change, dev);
|
||||
|
|
@ -1427,8 +1427,8 @@ static void usbredir_handle_destroy(USBDevice *udev)
|
|||
{
|
||||
USBRedirDevice *dev = USB_REDIRECT(udev);
|
||||
|
||||
qemu_chr_delete(dev->cs);
|
||||
dev->cs = NULL;
|
||||
qemu_chr_delete(dev->cs.chr);
|
||||
dev->cs.chr = NULL;
|
||||
/* Note must be done after qemu_chr_close, as that causes a close event */
|
||||
qemu_bh_delete(dev->chardev_close_bh);
|
||||
qemu_bh_delete(dev->device_reject_bh);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue