[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out common code |
Date: |
Fri, 14 Jun 2013 14:50:25 +0400 |
From: Peter Crosthwaite <address@hidden>
These three lines are common to both FIFO and regular mode. Just factor
them out to outside the if rather than replicate the same lines inside
both if and else.
Cc: address@hidden
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/char/serial.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 0a2b6c9..017610e 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -285,15 +285,11 @@ static void serial_ioport_write(void *opaque, hwaddr
addr, uint64_t val,
fifo8_pop(&s->xmit_fifo);
}
fifo8_push(&s->xmit_fifo, s->thr);
- s->thr_ipending = 0;
s->lsr &= ~UART_LSR_TEMT;
- s->lsr &= ~UART_LSR_THRE;
- serial_update_irq(s);
- } else {
- s->thr_ipending = 0;
- s->lsr &= ~UART_LSR_THRE;
- serial_update_irq(s);
}
+ s->thr_ipending = 0;
+ s->lsr &= ~UART_LSR_THRE;
+ serial_update_irq(s);
serial_xmit(NULL, G_IO_OUT, s);
}
break;
--
1.7.10.4
- [Qemu-trivial] [PULL 12/26] Makefile: Install qemu-img and qemu-nbd man pages only if built, (continued)
- [Qemu-trivial] [PULL 12/26] Makefile: Install qemu-img and qemu-nbd man pages only if built, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 06/26] curl: Whitespace only changes., Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 13/26] device tree: Fix cppcheck warning, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 15/26] target-sparc: Replace free by g_free, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 23/26] main-loop: do not include slirp/slirp.h, use libslirp.h instead, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 10/26] gtk: implement -full-screen, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix potential memory leaks, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 24/26] create qemu_openpty_raw() helper function and move it to a separate file, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 14/26] hw/scsi: Don't increment a boolean value, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 26/26] piix: fix some printf errors when debug is enabled, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out common code,
Michael Tokarev <=
- [Qemu-trivial] [PULL 20/26] KVM: PPC: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes., Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 17/26] ivshmem: add missing error exit(2), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 08/26] char/serial: Use generic Fifo8, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket on error paths, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 18/26] KVM: ARM: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 21/26] linux-headers: Update to v3.10-rc5, Michael Tokarev, 2013/06/14
- Re: [Qemu-trivial] [PULL 00/26] Trivial-patches pull request for 2013-06-14, Anthony Liguori, 2013/06/17