Hi, This no longer merges cleanly after the charflow series. I don't think it should be too bad to rebase. If you have any problems, let me know.
Regards, Anthony Liguori Gerd Hoffmann <kra...@redhat.com> writes: > Hi, > > This pull adds support for the missing chardev types and finally > re-enabling the hmp monitor chardev-add chardev-remove commands as qmp > is on par with hmp feature-wise now. > > Patches have been posted for review here: > https://lists.nongnu.org/archive/html/qemu-devel/2013-02/msg05273.html > > There are no changes (except for a conflict-less rebase to master), > so I'm not sending them again to the list. > > please pull, > Gerd > > The following changes since commit 0bc472a9d6b80567c212023c5eae413f4dfb53ad: > > hw/nand.c: correct the sense of the BUSY/READY status bit (2013-03-07 > 09:27:11 +0100) > > are available in the git repository at: > > git://git.kraxel.org/qemu chardev.2 > > for you to fetch changes up to e15c7f86c0e0f5cf0b0ea71da7fb79d76b15e52c: > > Revert "hmp: Disable chardev-add and chardev-remove" (2013-03-08 07:27:40 > +0100) > > ---------------------------------------------------------------- > Gerd Hoffmann (17): > chardev: add support for qapi-based chardev initialization > chardev: add mux chardev support to qapi > chardev: switch null init to qapi > chardev: add msmouse support to qapi > chardev: add braille support to qapi > chardev: switch file init to qapi > chardev: add stdio support to qapi > chardev: switch serial/tty init to qapi > chardev: switch parallel init to qapi > chardev: switch pty init to qapi > chardev: add console support to qapi > chardev: add pipe support to qapi > chardev: add spice support to qapi > chardev: add vc support to qapi > chardev: add memory (ringbuf) support to qapi > chardev: add udp support to qapi > Revert "hmp: Disable chardev-add and chardev-remove" > > hmp-commands.hx | 63 ++++--- > hw/baum.c | 2 +- > hw/baum.h | 2 +- > hw/msmouse.c | 2 +- > hw/msmouse.h | 2 +- > include/qemu/sockets.h | 1 + > include/ui/console.h | 4 +- > include/ui/qemu-spice.h | 7 +- > qapi-schema.json | 104 ++++++++++- > qemu-char.c | 440 > +++++++++++++++++++++++++++++++---------------- > spice-qemu-char.c | 26 ++- > ui/console.c | 26 +-- > ui/gtk.c | 2 +- > util/qemu-sockets.c | 25 +++ > 14 files changed, 491 insertions(+), 215 deletions(-)
