mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-char: Cleanup: consolidate fe_open/fe_close into fe_set_open

Browse Source 
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Message-id: 1364292483-16564-6-git-send-email-hdegoede@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Hans de Goede 2013-03-26 11:07:57 +01:00 committed by Anthony Liguori
parent 190832289f
commit 8e25daa87a
3 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/virtio-console.c
View File

@ -74,7 +74,7 @@ static void guest_open(VirtIOSerialPort *port)
if (!vcon->chr) { if (!vcon->chr) {
return; return;
} }
qemu_chr_fe_open(vcon->chr); qemu_chr_fe_set_open(vcon->chr, 1);
} }
/* Callback function that's called when the guest closes the port */ /* Callback function that's called when the guest closes the port */
@ -85,7 +85,7 @@ static void guest_close(VirtIOSerialPort *port)
if (!vcon->chr) { if (!vcon->chr) {
return; return;
} }
qemu_chr_fe_close(vcon->chr); qemu_chr_fe_set_open(vcon->chr, 0);
} }
/* Readiness of the guest to accept data on a port */ /* Readiness of the guest to accept data on a port */

17
include/char/char.h
View File

@ -129,21 +129,12 @@ void qemu_chr_delete(CharDriverState *chr);
void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo); void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo);
/** /**
* @qemu_chr_fe_open: * @qemu_chr_fe_set_open:
* *
* Open a character backend. This function call is an indication that the * Set character frontend open status. This is an indication that the
* front end is ready to begin doing I/O. * front end is ready (or not) to begin doing I/O.
*/ */
void qemu_chr_fe_open(struct CharDriverState *chr); void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open);
/**
* @qemu_chr_fe_close:
*
* Close a character backend. This function call indicates that the front end
* no longer is able to process I/O. To process I/O again, the front end will
* call @qemu_chr_fe_open.
*/
void qemu_chr_fe_close(struct CharDriverState *chr);
/** /**
* @qemu_chr_fe_printf: * @qemu_chr_fe_printf:

24
qemu-char.c
View File

@ -238,11 +238,7 @@ void qemu_chr_add_handlers(CharDriverState *s,
s->chr_update_read_handler(s); s->chr_update_read_handler(s);
if (!s->explicit_fe_open) { if (!s->explicit_fe_open) {
if (fe_open) { qemu_chr_fe_set_open(s, fe_open);
qemu_chr_fe_open(s);
} else {
qemu_chr_fe_close(s);
}
} }
/* We're connecting to an already opened device, so let's make sure we /* We're connecting to an already opened device, so let's make sure we
@ -3423,24 +3419,16 @@ void qemu_chr_fe_set_echo(struct CharDriverState *chr, bool echo)
} }
} }
void qemu_chr_fe_open(struct CharDriverState *chr) void qemu_chr_fe_set_open(struct CharDriverState *chr, int fe_open)
{ {
if (chr->fe_open) { if (chr->fe_open == fe_open) {
return; return;
} }
chr->fe_open = 1; chr->fe_open = fe_open;
if (chr->chr_guest_open) { if (fe_open && chr->chr_guest_open) {
chr->chr_guest_open(chr); chr->chr_guest_open(chr);
} }
} if (!fe_open && chr->chr_guest_close) {
void qemu_chr_fe_close(struct CharDriverState *chr)
{
if (!chr->fe_open) {
return;
}
chr->fe_open = 0;
if (chr->chr_guest_close) {
chr->chr_guest_close(chr); chr->chr_guest_close(chr);
} }
} }