[Qemu-devel] [PULL trivial/urgent 0/2] trivial-patches out-of-order pull request for 2013-06-17

[Qemu-devel] [PULL trivial/urgent 0/2] trivial-patches out-of-order pull request for 2013-06-17

[Michael Tokarev]

There were two bugs introduced in last changes which went through
trivial patches queue last week.  I already sent you two versions
of a fix for one issue (compile breakage with --disable-sdl), and
there's another one, serial crash.  Sending as a pull request too,
these should be applied ASAP as people are hitting the same issues
again and again.

Thanks,

/mjt

The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b:

  target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +0000)

are available in the git repository at:

  git://git.corpit.ru/qemu.git trivial-patches

for you to fetch changes up to f6d0923f8bc859d6bd9fac09d8df8c6db8a7b299:

  fixed a copy&paste error in serial.c (2013-06-17 11:38:55 +0400)

----------------------------------------------------------------
Michael Tokarev (1):
      vl: always define no_frame

Vladimir Senkov (1):
      fixed a copy&paste error in serial.c

 hw/char/serial.c |    2 +-
 vl.c             |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

[Qemu-devel] [PULL trivial/urgent 1/2] vl: always define no_frame

[Michael Tokarev]

Commit 047d4e151dd46 "Unbreak -no-quit for GTK, validate SDL options" broke
build of qemu without sdl, by referencing `no_frame' variable which is defined
inside #if SDL block.  Fix that by defining that variable unconditionally.

This is a better fix for the build issue introduced by that patch than
a revert.  This change keeps the new functinality introduced by that patch
and just fixes the compilation.  It still is not a complete fix around the
original issue (not working -no-frame et al with -display gtk), because it
makes only the legacy interface working, not the new suboption interface,
so a few more changes are needed.

Cc: Peter Wu <lekensteyn@gmail.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Peter Wu <lekensteyn@gmail.com>
---
 vl.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/vl.c b/vl.c
index 9f8fd6e..f94ec9c 100644
--- a/vl.c
+++ b/vl.c
@@ -199,9 +199,7 @@ static int rtc_date_offset = -1; /* -1 means no change */
 QEMUClock *rtc_clock;
 int vga_interface_type = VGA_NONE;
 static int full_screen = 0;
-#ifdef CONFIG_SDL
 static int no_frame = 0;
-#endif
 int no_quit = 0;
 CharDriverState *serial_hds[MAX_SERIAL_PORTS];
 CharDriverState *parallel_hds[MAX_PARALLEL_PORTS];
-- 
1.7.10.4

[Qemu-devel] [PULL trivial/urgent 2/2] fixed a copy&paste error in serial.c

[Michael Tokarev]

From: Vladimir Senkov <hangup@gmail.com>

Copy&paste error in serial.c causes a crash when attempting
to read from UART (if there is no data to be read)

Signed-off-by: Vladimir Senkov <hangup@gmail.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/char/serial.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/char/serial.c b/hw/char/serial.c
index b537e42..6382f98 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -424,7 +424,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size)
             ret = s->divider & 0xff;
         } else {
             if(s->fcr & UART_FCR_FE) {
-                ret = fifo8_is_full(&s->recv_fifo) ?
+                ret = fifo8_is_empty(&s->recv_fifo) ?
                             0 : fifo8_pop(&s->recv_fifo);
                 if (s->recv_fifo.num == 0) {
                     s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
-- 
1.7.10.4

Re: [Qemu-devel] [PULL trivial/urgent 2/2] fixed a copy&paste error in serial.c

[Andreas Färber]

Am 17.06.2013 09:44, schrieb Michael Tokarev:
> From: Vladimir Senkov <hangup@gmail.com>
> 
> Copy&paste error in serial.c causes a crash when attempting
> to read from UART (if there is no data to be read)
> 
> Signed-off-by: Vladimir Senkov <hangup@gmail.com>
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Any chance to get the subject improved before the pull is accepted?
E.g., "serial: Fix a copy&paste error" or "char/serial: ..."

Andreas

> ---
>  hw/char/serial.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index b537e42..6382f98 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -424,7 +424,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr addr, unsigned size)
>              ret = s->divider & 0xff;
>          } else {
>              if(s->fcr & UART_FCR_FE) {
> -                ret = fifo8_is_full(&s->recv_fifo) ?
> +                ret = fifo8_is_empty(&s->recv_fifo) ?
>                              0 : fifo8_pop(&s->recv_fifo);
>                  if (s->recv_fifo.num == 0) {
>                      s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [Qemu-trivial] [PULL trivial/urgent 2/2] fixed a copy&paste error in serial.c

[Michael Tokarev]

17.06.2013 12:00, Andreas Färber wrote:
> Any chance to get the subject improved before the pull is accepted?
> E.g., "serial: Fix a copy&paste error" or "char/serial: ..."

Fixed in the git tree --
 http://git.corpit.ru/?p=qemu.git;a=shortlog;h=refs/heads/trivial-patches

Thanks!

/mjt

Re: [Qemu-devel] [PULL trivial/urgent 0/2] trivial-patches out-of-order pull request for 2013-06-17

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori