On 07.12.2009, at 13:42, Gerd Hoffmann wrote:
> This patch adds a variable default_virtcon which says whenever a default
> virtio console should be added. It is disabled by default, followup
> patch will enable it for s390. It is cleared when qemu finds
> '-virtiocon', '-device virtio-console-s390' or '-device
> virtio-console-pci' on the command line.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> vl.c | 64 ++++++++++++++++++++++++++++++++++------------------------------
> 1 files changed, 34 insertions(+), 30 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 9949886..298ac73 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -270,6 +270,7 @@ static void *boot_set_opaque;
>
> static int default_serial = 1;
> static int default_parallel = 1;
> +static int default_virtcon = 1;
> static int default_monitor = 1;
> static int default_vga = 1;
> static int default_drive = 1;
> @@ -280,6 +281,8 @@ static struct {
> } default_list[] = {
> { .driver = "isa-serial", .flag = &default_serial },
> { .driver = "isa-parallel", .flag = &default_parallel },
> + { .driver = "virtio-console-pci", .flag = &default_virtcon },
> + { .driver = "virtio-console-s390", .flag = &default_virtcon },
Hm, what does this do? Create both virtio-console-pci and virtio-console-s390
when default_virtcon=1?
Then I'm pretty sure this will break when (if) we ever get PCI support on S390.
Defaults really belong in the machine definition.
Alex
