isa-vga: Make available with -device, like the other VGA qdevs

Switch no_user off and make it suppress the default VGA.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index fde0d56fd38cfe2e5e68c8dd0ff73a6aa97f0461..245841f18b3f720e2074a333bb9866b9ce3a696b 100644 (file)
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -77,7 +77,6 @@ static ISADeviceInfo vga_info = {
     .qdev.size     = sizeof(ISAVGAState),
     .qdev.vmsd     = &vmstate_vga_common,
     .qdev.reset     = vga_reset_isa,
-    .qdev.no_user  = 1,
     .init          = vga_initfn,
 };
 

diff --git a/vl.c b/vl.c
index 11f6386101ff5d90062b7ec02649dfa8665ddb62..04b4a20ecc25328be222149b03090f9bce73aa98 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -289,6 +289,7 @@ static struct {
     { .driver = "VGA",                  .flag = &default_vga       },
     { .driver = "cirrus-vga",           .flag = &default_vga       },
     { .driver = "vmware-svga",          .flag = &default_vga       },
+    { .driver = "isa-vga",              .flag = &default_vga       },
 };
 
 static int default_driver_check(QemuOpts *opts, void *opaque)