From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTF3M-0007sx-2m for qemu-devel@nongnu.org; Tue, 21 Jul 2009 09:06:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTF3H-0007nK-3a for qemu-devel@nongnu.org; Tue, 21 Jul 2009 09:06:43 -0400 Received: from [199.232.76.173] (port=54807 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTF3G-0007n5-NJ for qemu-devel@nongnu.org; Tue, 21 Jul 2009 09:06:38 -0400 Received: from mx2.redhat.com ([66.187.237.31]:35087) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTF3G-0006z0-5J for qemu-devel@nongnu.org; Tue, 21 Jul 2009 09:06:38 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6LD6b6X001802 for ; Tue, 21 Jul 2009 09:06:37 -0400 From: Gerd Hoffmann Date: Tue, 21 Jul 2009 15:06:31 +0200 Message-Id: <1248181591-22013-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] compat: fixup two compat machine types. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Now we have *two* 0.10 compat pc types merged: One using a separate devices and init functions. And one switching the existing device into compat mode using properties. I think one of them is enougth ;) Signed-off-by: Gerd Hoffmann --- hw/pc.c | 59 +++++++----------------------------------------------- hw/virtio-pci.c | 19 ----------------- 2 files changed, 8 insertions(+), 70 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index a50f23d..c7b8480 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -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) @@ -1519,9 +1484,9 @@ static QEMUMachine pc_machine = { .is_default = 1, }; -static QEMUMachine pc_machine_v0_10 = { - .name = "pc-0.10", - .desc = "Standard PC, qemu 0.10", +static QEMUMachine pc_0_10_machine = { + .name = "pc-0-10", + .desc = "Standard PC compatible with qemu 0.10.x", .init = pc_init_pci, .max_cpus = 255, .compat_props = (CompatProperty[]) { @@ -1549,17 +1514,9 @@ 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 */ diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 1f922c2..83e6d46 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -447,11 +447,6 @@ static void virtio_blk_init_pci(PCIDevice *pci_dev) virtio_blk_init_pci_with_class(pci_dev, proxy->class_code); } -static void virtio_blk_init_pci_0_10(PCIDevice *pci_dev) -{ - virtio_blk_init_pci_with_class(pci_dev, PCI_CLASS_STORAGE_OTHER); -} - static void virtio_console_init_pci_with_class(PCIDevice *pci_dev, uint16_t class_code) { @@ -477,11 +472,6 @@ static void virtio_console_init_pci(PCIDevice *pci_dev) virtio_console_init_pci_with_class(pci_dev, proxy->class_code); } -static void virtio_console_init_pci_0_10(PCIDevice *pci_dev) -{ - virtio_console_init_pci_with_class(pci_dev, PCI_CLASS_DISPLAY_OTHER); -} - static void virtio_net_init_pci(PCIDevice *pci_dev) { VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); @@ -561,15 +551,6 @@ static PCIDeviceInfo virtio_info[] = { .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, },{ - /* For compatibility with 0.10 */ - .qdev.name = "virtio-blk-pci-0-10", - .qdev.size = sizeof(VirtIOPCIProxy), - .init = virtio_blk_init_pci_0_10, - },{ - .qdev.name = "virtio-console-pci-0-10", - .qdev.size = sizeof(VirtIOPCIProxy), - .init = virtio_console_init_pci_0_10, - },{ /* end of list */ } }; -- 1.6.2.5