virtio-serial: Clean up virtconsole detection

virtio-serial-bus needs to treat "virtconsole" devices specially.  It
uses VirtIOSerialPort member is_console to recognize them.  It gets
its value via property initialization.  Cute hack, except it lets
users mess with it: "-device virtconsole,is_console=0" isn't plugged
into port 0 as it should.

Move the flag to VirtIOSerialPortInfo.  Keep the property for backward
compatibility; its value has no effect.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Markus Armbruster 2011-05-25 14:21:11 +02:00 committed by Amit Shah
parent 5e52e5f903
commit 2a3d57ce42
3 changed files with 11 additions and 6 deletions

View file

@ -124,8 +124,8 @@ struct VirtIOSerialPort {
*/
QEMUBH *bh;
/* Identify if this is a port that binds with hvc in the guest */
uint8_t is_console;
/* For property backward compatibility, not used otherwise */
uint8_t is_console_dummy;
/* Is the corresponding guest device open? */
bool guest_connected;
@ -137,6 +137,10 @@ struct VirtIOSerialPort {
struct VirtIOSerialPortInfo {
DeviceInfo qdev;
/* Is this a device that binds with hvc in the guest? */
bool is_console;
/*
* The per-port (or per-app) init function that's called when a
* new device is found on the bus.