[Qemu-devel] Re: -serial stdio broken

[Blue Swirl <blauwirbel@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1857 bytes --]

On Sun, Dec 13, 2009 at 8:24 AM, Blue Swirl <blauwirbel@gmail.com> wrote:
> I guess e1c09175bc00dd8dfb2ad1b26e1858dcdc109b59 or
> 998bbd74b9d813b14a3a3b5009a5d5a48c7dce51 broke -serial stdio for all
> targets:
> qemu -serial stdio -monitor stdio
> chardev: opening backend "stdio" failed
> qemu: could not open serial device 'stdio': No such file or directory
>

e1c09175bc00dd8dfb2ad1b26e1858dcdc109b59 is first bad commit
commit e1c09175bc00dd8dfb2ad1b26e1858dcdc109b59
Author: Gerd Hoffmann <kraxel@redhat.com>
Date:   Tue Dec 8 13:11:44 2009 +0100

    zap serial_monitor_mux

    The logic in this code obviously predates the multiple monitor
    capability of qemu and looks increasingly silly these days.

    I think the intention of this piece of code is to get a reasonable
    default for the -nographic case: have monitor and serial line muxed
    on stdio.

    With the new default_serial and default_monitor variables we have now
    doing just that became much easier ;)

    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

:100644 100644 0d3f5e6687934a94e8586a13b2f5b7432065c430
e3e035f45349c8a2a86317dc46575c899acc8321 M      vl.c

git revert e1c09175bc00dd8dfb2ad1b26e1858dcdc109b59
Auto-merged vl.c
CONFLICT (content): Merge conflict in vl.c
Automatic revert failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result.

My attempt to merge (attached) does not compile:
/src/qemu/vl.c: In function 'serial_monitor_mux':
/src/qemu/vl.c:4795: error: 'DEV_MONITOR' undeclared (first use in
this function)
/src/qemu/vl.c:4795: error: (Each undeclared identifier is reported only once
/src/qemu/vl.c:4795: error: for each function it appears in.)

Please fix ASAP, this happens to break my test setup completely.

[-- Attachment #2: 0001-Revert-zap-serial_monitor_mux.patch --]
[-- Type: application/x-patch, Size: 2453 bytes --]