| Message ID | 20180420145249.32435-5-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 6afd0e297ff7f16caf879251adcce7b1d07acd05 |
| Headers | show |
| Series | Drop compile time limit on number of serial ports | expand |
On 04/20/2018 11:52 AM, Peter Maydell wrote: > Following commit 12051d82f004024, UART devices should handle > being passed a NULL pointer chardev, so we don't need to > create "null" backends in board code. Remove the code that > does this and updates serial_hds[]. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/mips/mips_malta.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index f6513a4fd5..49fe7a0a72 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1056,11 +1056,6 @@ void mips_malta_init(MachineState *machine) > > /* FPGA */ > > - /* Make sure the second serial port is associated with a device. */ > - if (!serial_hds[2]) { > - serial_hds[2] = qemu_chr_new("fpga-uart", "null"); > - } > - > /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */ > malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]); > >
On 20.04.2018 16:52, Peter Maydell wrote: > Following commit 12051d82f004024, UART devices should handle > being passed a NULL pointer chardev, so we don't need to > create "null" backends in board code. Remove the code that > does this and updates serial_hds[]. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/mips/mips_malta.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index f6513a4fd5..49fe7a0a72 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1056,11 +1056,6 @@ void mips_malta_init(MachineState *machine) > > /* FPGA */ > > - /* Make sure the second serial port is associated with a device. */ > - if (!serial_hds[2]) { > - serial_hds[2] = qemu_chr_new("fpga-uart", "null"); > - } > - > /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */ > malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]); Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index f6513a4fd5..49fe7a0a72 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1056,11 +1056,6 @@ void mips_malta_init(MachineState *machine) /* FPGA */ - /* Make sure the second serial port is associated with a device. */ - if (!serial_hds[2]) { - serial_hds[2] = qemu_chr_new("fpga-uart", "null"); - } - /* The CBUS UART is attached to the MIPS CPU INT2 pin, ie interrupt 4 */ malta_fpga_init(system_memory, FPGA_ADDRESS, cbus_irq, serial_hds[2]);
Following commit 12051d82f004024, UART devices should handle being passed a NULL pointer chardev, so we don't need to create "null" backends in board code. Remove the code that does this and updates serial_hds[]. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/mips/mips_malta.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.17.0