mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
char: remove explicit_fe_open, use a set_handlers argument
No need to keep explicit_fe_open around if it affects only a qemu_chr_fe_set_handlers(). Use an additional argument instead. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20161022095318.17775-24-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
committed by
Paolo Bonzini
parent
72ac876248
commit
39ab61c6d0
+1
-1
@@ -106,7 +106,7 @@ static void rng_egd_opened(RngBackend *b, Error **errp)
|
||||
|
||||
/* FIXME we should resubmit pending requests when the CDS reconnects. */
|
||||
qemu_chr_fe_set_handlers(&s->chr, rng_egd_chr_can_read,
|
||||
rng_egd_chr_read, NULL, s, NULL);
|
||||
rng_egd_chr_read, NULL, s, NULL, true);
|
||||
}
|
||||
|
||||
static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp)
|
||||
|
||||
@@ -1779,7 +1779,7 @@ int gdbserver_start(const char *device)
|
||||
if (chr) {
|
||||
qemu_chr_fe_init(&s->chr, chr, &error_abort);
|
||||
qemu_chr_fe_set_handlers(&s->chr, gdb_chr_can_receive, gdb_chr_receive,
|
||||
gdb_chr_event, NULL, NULL);
|
||||
gdb_chr_event, NULL, NULL, true);
|
||||
}
|
||||
s->state = chr ? RS_IDLE : RS_INACTIVE;
|
||||
s->mon_chr = mon_chr;
|
||||
|
||||
+1
-1
@@ -1976,7 +1976,7 @@ static void pxa2xx_fir_realize(DeviceState *dev, Error **errp)
|
||||
PXA2xxFIrState *s = PXA2XX_FIR(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, pxa2xx_fir_is_empty,
|
||||
pxa2xx_fir_rx, pxa2xx_fir_event, s, NULL);
|
||||
pxa2xx_fir_rx, pxa2xx_fir_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static bool pxa2xx_fir_vmstate_validate(void *opaque, int version_id)
|
||||
|
||||
+1
-1
@@ -1241,7 +1241,7 @@ static void strongarm_uart_init(Object *obj)
|
||||
strongarm_uart_can_receive,
|
||||
strongarm_uart_receive,
|
||||
strongarm_uart_event,
|
||||
s, NULL);
|
||||
s, NULL, true);
|
||||
}
|
||||
|
||||
static void strongarm_uart_reset(DeviceState *dev)
|
||||
|
||||
@@ -279,7 +279,7 @@ static void bcm2835_aux_realize(DeviceState *dev, Error **errp)
|
||||
BCM2835AuxState *s = BCM2835_AUX(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, bcm2835_aux_can_receive,
|
||||
bcm2835_aux_receive, NULL, s, NULL);
|
||||
bcm2835_aux_receive, NULL, s, NULL, true);
|
||||
}
|
||||
|
||||
static Property bcm2835_aux_props[] = {
|
||||
|
||||
@@ -467,7 +467,7 @@ static void cadence_uart_realize(DeviceState *dev, Error **errp)
|
||||
fifo_trigger_update, s);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, uart_can_receive, uart_receive,
|
||||
uart_event, s, NULL);
|
||||
uart_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void cadence_uart_init(Object *obj)
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ static void debugcon_realize_core(DebugconState *s, Error **errp)
|
||||
return;
|
||||
}
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, NULL, s, NULL);
|
||||
qemu_chr_fe_set_handlers(&s->chr, NULL, NULL, NULL, s, NULL, true);
|
||||
}
|
||||
|
||||
static void debugcon_isa_realizefn(DeviceState *dev, Error **errp)
|
||||
|
||||
@@ -146,7 +146,7 @@ static void digic_uart_realize(DeviceState *dev, Error **errp)
|
||||
DigicUartState *s = DIGIC_UART(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
||||
uart_event, s, NULL);
|
||||
uart_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void digic_uart_init(Object *obj)
|
||||
|
||||
+1
-1
@@ -1016,7 +1016,7 @@ static void escc_realize(DeviceState *dev, Error **errp)
|
||||
s->chn[i].clock = s->frequency / 2;
|
||||
qemu_chr_fe_set_handlers(&s->chn[i].chr, serial_can_receive,
|
||||
serial_receive1, serial_event,
|
||||
&s->chn[i], NULL);
|
||||
&s->chn[i], NULL, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ static void etraxfs_ser_realize(DeviceState *dev, Error **errp)
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr,
|
||||
serial_can_receive, serial_receive,
|
||||
serial_event, s, NULL);
|
||||
serial_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void etraxfs_ser_class_init(ObjectClass *klass, void *data)
|
||||
|
||||
@@ -642,7 +642,7 @@ static int exynos4210_uart_init(SysBusDevice *dev)
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, exynos4210_uart_can_receive,
|
||||
exynos4210_uart_receive, exynos4210_uart_event,
|
||||
s, NULL);
|
||||
s, NULL, true);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -247,7 +247,7 @@ static int grlib_apbuart_init(SysBusDevice *dev)
|
||||
grlib_apbuart_can_receive,
|
||||
grlib_apbuart_receive,
|
||||
grlib_apbuart_event,
|
||||
uart, NULL);
|
||||
uart, NULL, true);
|
||||
|
||||
sysbus_init_irq(dev, &uart->irq);
|
||||
|
||||
|
||||
@@ -316,7 +316,7 @@ static void imx_serial_realize(DeviceState *dev, Error **errp)
|
||||
DPRINTF("char dev for uart: %p\n", qemu_chr_fe_get_driver(&s->chr));
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, imx_can_receive, imx_receive,
|
||||
imx_event, s, NULL);
|
||||
imx_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void imx_serial_init(Object *obj)
|
||||
|
||||
@@ -544,7 +544,8 @@ static void ipoctal_realize(DeviceState *dev, Error **errp)
|
||||
/* Redirect IP-Octal channels to host character devices */
|
||||
if (qemu_chr_fe_get_driver(&ch->dev)) {
|
||||
qemu_chr_fe_set_handlers(&ch->dev, hostdev_can_receive,
|
||||
hostdev_receive, hostdev_event, ch, NULL);
|
||||
hostdev_receive, hostdev_event,
|
||||
ch, NULL, true);
|
||||
DPRINTF("Redirecting channel %u to %s\n", i, ch->dev->label);
|
||||
} else {
|
||||
DPRINTF("Could not redirect channel %u, no chardev set\n", i);
|
||||
|
||||
@@ -119,7 +119,7 @@ static void lm32_juart_realize(DeviceState *dev, Error **errp)
|
||||
LM32JuartState *s = LM32_JUART(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, juart_can_rx, juart_rx,
|
||||
juart_event, s, NULL);
|
||||
juart_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_lm32_juart = {
|
||||
|
||||
+1
-1
@@ -266,7 +266,7 @@ static void lm32_uart_realize(DeviceState *dev, Error **errp)
|
||||
LM32UartState *s = LM32_UART(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
||||
uart_event, s, NULL);
|
||||
uart_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_lm32_uart = {
|
||||
|
||||
+2
-1
@@ -284,7 +284,8 @@ void *mcf_uart_init(qemu_irq irq, CharDriverState *chr)
|
||||
if (chr) {
|
||||
qemu_chr_fe_init(&s->chr, chr, &error_abort);
|
||||
qemu_chr_fe_set_handlers(&s->chr, mcf_uart_can_receive,
|
||||
mcf_uart_receive, mcf_uart_event, s, NULL);
|
||||
mcf_uart_receive, mcf_uart_event,
|
||||
s, NULL, true);
|
||||
}
|
||||
mcf_uart_reset(s);
|
||||
return s;
|
||||
|
||||
@@ -199,7 +199,7 @@ static void milkymist_uart_realize(DeviceState *dev, Error **errp)
|
||||
MilkymistUartState *s = MILKYMIST_UART(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, uart_can_rx, uart_rx,
|
||||
uart_event, s, NULL);
|
||||
uart_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void milkymist_uart_init(Object *obj)
|
||||
|
||||
+1
-1
@@ -329,7 +329,7 @@ static void pl011_realize(DeviceState *dev, Error **errp)
|
||||
PL011State *s = PL011(dev);
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chr, pl011_can_receive, pl011_receive,
|
||||
pl011_event, s, NULL);
|
||||
pl011_event, s, NULL, true);
|
||||
}
|
||||
|
||||
static void pl011_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
@@ -313,7 +313,7 @@ static int console_init(SCLPEvent *event)
|
||||
console_available = true;
|
||||
|
||||
qemu_chr_fe_set_handlers(&scon->chr, chr_can_read,
|
||||
chr_read, NULL, scon, NULL);
|
||||
chr_read, NULL, scon, NULL, true);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user