Implement "info chardev" command. (Gerd Hoffmann)
PATCH 1/1 Implement "info chardev" command. (Gerd Hoffmann)
Import "Implement "info chardev" command." from qemu mainstream.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5575 c046a42c-6fe2-441c-8c8c-71466251a162
Signed-off-by Stefano Stabellini <[email protected]>
---
gdbstub.c +1 -1
@@ -1852,7 +1852,7 @@ port = gdbstub_port_name; } - chr =qemu_chr_open (port); + chr =qemu_chr_open ("gdb" , port);if (!chr)return -1 ;
hw/usb-serial.c +4 -1
@@ -521,6 +521,8 @@USBSerialState *s;CharDriverState *cdrv;unsigned short vendorid =0x0403 , productid =0x6001 ; +char label[32 ]; +static int index;while (*filename && *filename !=':' ) {const char *p;
@@ -555,7 +557,8 @@if (!s)return NULL ; - cdrv =qemu_chr_open (filename); +snprintf (label,sizeof (label),"usbserial%d" , index++); + cdrv =qemu_chr_open (label, filename);if (!cdrv) goto fail; s->cs = cdrv;
monitor.c +2 -0
@@ -1477,6 +1477,8 @@ "", "show the version of qemu" }, {"network" ,"" , do_info_network, "", "show the network state" }, + { "chardev", "", qemu_chr_info, + "", "show the character devices" }, { "block", "", do_info_block, "", "show the block devices" }, { "blockstats", "", do_info_blockstats,
qemu-char.h +6 -1
@@ -1,6 +1,7 @@#ifndef QEMU_CHAR_H #define QEMU_CHAR_H +#include "sys-queue.h" /* character device */ #define CHR_EVENT_BREAK 0/* serial break char */
@@ -56,9 +57,12 @@void *opaque;int focus;QEMUBH *bh; +char *label; +char *filename; +TAILQ_ENTRY (CharDriverState) next; }; -CharDriverState *qemu_chr_open (const char *filename); +CharDriverState *qemu_chr_open (const char *label,const char *filename);void qemu_chr_close (CharDriverState *chr);void qemu_chr_printf (CharDriverState *s,const char *fmt, ...);int qemu_chr_write (CharDriverState *s,const uint8_t *buf,int len);
@@ -73,6 +77,7 @@int qemu_chr_can_read (CharDriverState *s);void qemu_chr_read (CharDriverState *s,uint8_t *buf,int len);void qemu_chr_accept_input (CharDriverState *s); +void qemu_chr_info (void );/* async I/O support */
vl.c +70 -38
192 lines not on this page · raw message