From a43f9c90c9129d1f28e473277abf793d0caed897 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 24 Feb 2011 11:14:12 +0530 Subject: virtio-serial: kill VirtIOSerialDevice 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 Signed-off-by: Amit Shah Signed-off-by: Anthony Liguori --- hw/virtio-serial.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'hw/virtio-serial.h') diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index a308196786..8cb9fbeb54 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -62,11 +62,6 @@ typedef struct VirtIOSerialBus VirtIOSerialBus; typedef struct VirtIOSerialPort VirtIOSerialPort; typedef struct VirtIOSerialPortInfo VirtIOSerialPortInfo; -typedef struct VirtIOSerialDevice { - DeviceState qdev; - VirtIOSerialPortInfo *info; -} VirtIOSerialDevice; - /* * This is the state that's shared between all the ports. Some of the * state is configurable via command-line options. Some of it can be @@ -136,12 +131,12 @@ struct VirtIOSerialPortInfo { * The per-port (or per-app) init function that's called when a * new device is found on the bus. */ - int (*init)(VirtIOSerialDevice *dev); + int (*init)(VirtIOSerialPort *port); /* * Per-port exit function that's called when a port gets * hot-unplugged or removed. */ - int (*exit)(VirtIOSerialDevice *dev); + int (*exit)(VirtIOSerialPort *port); /* Callbacks for guest events */ /* Guest opened device. */ -- cgit v1.2.3