defaults: update device_list[]
Add isa-fdc (disables default_floppy). Add ide-drive (disables default_cdrom). Also walk the -global QemuOpts, so we'll catch -global isa-fdc.drive{A,B}=<name> too. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
ac33f8fad1
commit
d8bcbabf26
@ -7,6 +7,7 @@ extern QemuOptsList qemu_device_opts;
|
||||
extern QemuOptsList qemu_netdev_opts;
|
||||
extern QemuOptsList qemu_net_opts;
|
||||
extern QemuOptsList qemu_rtc_opts;
|
||||
extern QemuOptsList qemu_global_opts;
|
||||
extern QemuOptsList qemu_mon_opts;
|
||||
|
||||
int qemu_set_option(const char *str);
|
||||
|
3
vl.c
3
vl.c
@ -284,6 +284,8 @@ static struct {
|
||||
} default_list[] = {
|
||||
{ .driver = "isa-serial", .flag = &default_serial },
|
||||
{ .driver = "isa-parallel", .flag = &default_parallel },
|
||||
{ .driver = "isa-fdc", .flag = &default_floppy },
|
||||
{ .driver = "ide-drive", .flag = &default_cdrom },
|
||||
{ .driver = "virtio-console-pci", .flag = &default_virtcon },
|
||||
{ .driver = "virtio-console-s390", .flag = &default_virtcon },
|
||||
{ .driver = "VGA", .flag = &default_vga },
|
||||
@ -5676,6 +5678,7 @@ int main(int argc, char **argv, char **envp)
|
||||
}
|
||||
|
||||
qemu_opts_foreach(&qemu_device_opts, default_driver_check, NULL, 0);
|
||||
qemu_opts_foreach(&qemu_global_opts, default_driver_check, NULL, 0);
|
||||
|
||||
if (machine->no_serial) {
|
||||
default_serial = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user