motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 23:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-serial: kill VirtIOSerialDevice

Browse source 
VirtIOSerialDevice is like VirtIOSerialPort with just the first two
fields, which makes it pretty pointless.  Using VirtIOSerialPort
directly works equally well and is less confusing.

[Amit: - rebase
       - rename 'dev' to 'port' in function params in virtio-serial.h ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2011-02-24 11:14:12 +05:30 • committed by Anthony Liguori
parent 61a11c98b7
commit a43f9c90c9
3 changed files with 14 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hw/virtio-console.c
View file

@ -57,10 +57,8 @@ static void chr_event(void *opaque, int event)
}
}
static int generic_port_init(VirtConsole *vcon, VirtIOSerialDevice *dev)
static int generic_port_init(VirtConsole *vcon, VirtIOSerialPort *port)
{
vcon->port.info = dev->info;
if (vcon->chr) {
qemu_chr_add_handlers(vcon->chr, chr_can_read, chr_read, chr_event,
vcon);
@ -70,18 +68,16 @@ static int generic_port_init(VirtConsole *vcon, VirtIOSerialDevice *dev)
}
/* Virtio Console Ports */
static int virtconsole_initfn(VirtIOSerialDevice *dev)
static int virtconsole_initfn(VirtIOSerialPort *port)
{
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
port->is_console = true;
return generic_port_init(vcon, dev);
return generic_port_init(vcon, port);
}
static int virtconsole_exitfn(VirtIOSerialDevice *dev)
static int virtconsole_exitfn(VirtIOSerialPort *port)
{
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
if (vcon->chr) {
@ -113,12 +109,11 @@ static void virtconsole_register(void)
device_init(virtconsole_register)
/* Generic Virtio Serial Ports */
static int virtserialport_initfn(VirtIOSerialDevice *dev)
static int virtserialport_initfn(VirtIOSerialPort *port)
{
VirtIOSerialPort *port = DO_UPCAST(VirtIOSerialPort, dev, &dev->qdev);
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
return generic_port_init(vcon, dev);
return generic_port_init(vcon, port);
}
static VirtIOSerialPortInfo virtserialport_info = {