chardev: add pty chardev support to chardev-add (qmp)
The ptsname is returned directly, so there is no need to use query-chardev to figure the pty device path. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
		
							parent
							
								
									f6bd5d6ec5
								
							
						
					
					
						commit
						0a1a7fabda
					
				| 
						 | 
				
			
			@ -3081,6 +3081,7 @@
 | 
			
		|||
{ 'union': 'ChardevBackend', 'data': { 'file'   : 'ChardevFile',
 | 
			
		||||
                                       'port'   : 'ChardevPort',
 | 
			
		||||
                                       'socket' : 'ChardevSocket',
 | 
			
		||||
                                       'pty'    : 'ChardevDummy',
 | 
			
		||||
                                       'null'   : 'ChardevDummy' } }
 | 
			
		||||
 | 
			
		||||
##
 | 
			
		||||
| 
						 | 
				
			
			@ -3090,7 +3091,7 @@
 | 
			
		|||
#
 | 
			
		||||
# Since: 1.4
 | 
			
		||||
##
 | 
			
		||||
{ 'type' : 'ChardevReturn', 'data': { } }
 | 
			
		||||
{ 'type' : 'ChardevReturn', 'data': { '*pty' : 'str' } }
 | 
			
		||||
 | 
			
		||||
##
 | 
			
		||||
# @chardev-add:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										13
									
								
								qemu-char.c
								
								
								
								
							
							
						
						
									
										13
									
								
								qemu-char.c
								
								
								
								
							| 
						 | 
				
			
			@ -3204,6 +3204,19 @@ ChardevReturn *qmp_chardev_add(const char *id, ChardevBackend *backend,
 | 
			
		|||
    case CHARDEV_BACKEND_KIND_SOCKET:
 | 
			
		||||
        chr = qmp_chardev_open_socket(backend->socket, errp);
 | 
			
		||||
        break;
 | 
			
		||||
#ifdef HAVE_CHARDEV_TTY
 | 
			
		||||
    case CHARDEV_BACKEND_KIND_PTY:
 | 
			
		||||
    {
 | 
			
		||||
        /* qemu_chr_open_pty sets "path" in opts */
 | 
			
		||||
        QemuOpts *opts;
 | 
			
		||||
        opts = qemu_opts_create_nofail(qemu_find_opts("chardev"));
 | 
			
		||||
        chr = qemu_chr_open_pty(opts);
 | 
			
		||||
        ret->pty = g_strdup(qemu_opt_get(opts, "path"));
 | 
			
		||||
        ret->has_pty = true;
 | 
			
		||||
        qemu_opts_del(opts);
 | 
			
		||||
        break;
 | 
			
		||||
    }
 | 
			
		||||
#endif
 | 
			
		||||
    case CHARDEV_BACKEND_KIND_NULL:
 | 
			
		||||
        chr = qemu_chr_open_null(NULL);
 | 
			
		||||
        break;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2685,6 +2685,11 @@ Examples:
 | 
			
		|||
                                   "data" : { "out" : "/tmp/bar.log" } } } }
 | 
			
		||||
<- { "return": {} }
 | 
			
		||||
 | 
			
		||||
-> { "execute" : "chardev-add",
 | 
			
		||||
     "arguments" : { "id" : "baz",
 | 
			
		||||
                     "backend" : { "type" : "pty", "data" : {} } } }
 | 
			
		||||
<- { "return": { "pty" : "/dev/pty/42" } }
 | 
			
		||||
 | 
			
		||||
EQMP
 | 
			
		||||
 | 
			
		||||
    {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue