diff options
| -rw-r--r-- | hw/pc.c | 55 |
1 files changed, 5 insertions, 50 deletions
@@ -1100,11 +1100,6 @@ static CPUState *pc_new_cpu(const char *cpu_model) return env; } -enum { - COMPAT_DEFAULT = 0, - COMPAT_0_10, /* compatible with qemu 0.10.x */ -}; - /* PC hardware initialisation */ static void pc_init1(ram_addr_t ram_size, const char *boot_device, @@ -1112,8 +1107,7 @@ static void pc_init1(ram_addr_t ram_size, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model, - int pci_enabled, - int compat_level) + int pci_enabled) { char *filename; int ret, linux_boot, i; @@ -1131,7 +1125,6 @@ static void pc_init1(ram_addr_t ram_size, BlockDriverState *fd[MAX_FD]; int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled; void *fw_cfg; - const char *virtio_blk_name, *virtio_console_name; if (ram_size >= 0xe0000000 ) { above_4g_mem_size = ram_size - 0xe0000000; @@ -1422,26 +1415,13 @@ static void pc_init1(ram_addr_t ram_size, } } - switch (compat_level) { - case COMPAT_DEFAULT: - default: - virtio_blk_name = "virtio-blk-pci"; - virtio_console_name = "virtio-console-pci"; - break; - - case COMPAT_0_10: - virtio_blk_name = "virtio-blk-pci-0-10"; - virtio_console_name = "virtio-console-pci-0-10"; - break; - } - /* Add virtio block devices */ if (pci_enabled) { int index; int unit_id = 0; while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) { - pci_dev = pci_create(virtio_blk_name, + pci_dev = pci_create("virtio-blk-pci", drives_table[index].devaddr); qdev_init(&pci_dev->qdev); unit_id++; @@ -1458,7 +1438,7 @@ static void pc_init1(ram_addr_t ram_size, if (pci_enabled) { for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) { if (virtcon_hds[i]) { - pci_create_simple(pci_bus, -1, virtio_console_name); + pci_create_simple(pci_bus, -1, "virtio-console-pci"); } } } @@ -1473,8 +1453,7 @@ static void pc_init_pci(ram_addr_t ram_size, { pc_init1(ram_size, boot_device, kernel_filename, kernel_cmdline, - initrd_filename, cpu_model, - 1, COMPAT_DEFAULT); + initrd_filename, cpu_model, 1); } static void pc_init_isa(ram_addr_t ram_size, @@ -1486,21 +1465,7 @@ static void pc_init_isa(ram_addr_t ram_size, { pc_init1(ram_size, boot_device, kernel_filename, kernel_cmdline, - initrd_filename, cpu_model, - 0, COMPAT_DEFAULT); -} - -static void pc_init_pci_0_10(ram_addr_t ram_size, - const char *boot_device, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, - const char *cpu_model) -{ - pc_init1(ram_size, boot_device, - kernel_filename, kernel_cmdline, - initrd_filename, cpu_model, - 1, COMPAT_0_10); + initrd_filename, cpu_model, 0); } /* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) @@ -1550,21 +1515,11 @@ static QEMUMachine isapc_machine = { .max_cpus = 1, }; -static QEMUMachine pc_0_10_machine = { - .name = "pc-0-10", - .desc = "Standard PC compatible with qemu 0.10.x", - .init = pc_init_pci_0_10, - .max_cpus = 255, -}; - static void pc_machine_init(void) { qemu_register_machine(&pc_machine); qemu_register_machine(&pc_machine_v0_10); qemu_register_machine(&isapc_machine); - - /* For compatibility with 0.10.x */ - qemu_register_machine(&pc_0_10_machine); } machine_init(pc_machine_init); |