From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mi7aF-0004fS-88 for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mi7a8-0004ck-V0 for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:09 -0400 Received: from [199.232.76.173] (port=43318 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7a8-0004cV-Da for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4213) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mi7a7-0003Be-VJ for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:04 -0400 From: Juan Quintela Date: Mon, 31 Aug 2009 16:07:10 +0200 Message-Id: Subject: [Qemu-devel] [PATCH 00/23] VGA cleanup List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com This patch: - cleans the differences between VGAState/VGACommon state - moves vga pci, isa, isa-mm out of vga.c (cirrus and blizzar uses VGA common state). - Cleans all the cirrus_hook_* stuff is something that don't look like a hook :) I would want this bits morged/reviewed before going the rest of the cleanup: Todo: - vga_ioport_read/write and cirrus_vga_ioport_read/write are almost identical after this series of changes. Creating read/write() callbacks for sr/gr/cr/palette. Should put us there. The cirrus ones were the difficult ones, the vga ones are trivial. - CONFIG_VBE_BOCHS code. This code is only used by vga std (pci + isa). Neither cirrus/blizzard/isa-mm uses it. It should be moved out of vga.c, vga-std.c?, and then used by vga-isa and vga-pci? - vmware_vga: it uses vga as embeded, but it don't save its state, I am not sure if it wants/need VBE_BOCHS, .... I haven't looked at vmware_vga too much, just to vga and cirrus_vga. Comments? Later, Juan. Juan Quintela (23): vga: remove useless cast from void * cirrus_vga: prefix vga_ioport_{read,write} with cirrus vga: export vga_ioport_{read,write} vga: split vga_{load,save} into pci and common parts vga: split pci bits into vga-pci.c vga: split isa bits inco vga-isa.c vga: export vga_mem_{read,write} vga: split vga-isa-mm.o vga and cirrus_vga: create vga_ioport_invalid() and use it everywhere cirrus_vga: Add a VGACommonState local var to cirrus_vga_ioport_{read,write} vga: change tabs to spaces cirrus_vga: make cirrus_read_hidden_dac() return its result vga and cirrus_vga: substitute switch for equivalent assigntment vga: Rename last VGAState occurrences to VGACommonState cirrus_vga: rename cirrus_hook_read_sr() cirrus_vga_read_sr() cirrus_vga: rename cirrus_hook_write_sr() cirrus_vga_write_sr() cirrus_vga: rename cirrus_hook_read_palette() cirrus_vga_read_palette() cirrus_vga: rename cirrus_hook_write_palette() cirrus_vga_write_palette() cirrus_vga: rename cirrus_hook_read_gr() cirrus_vga_read_gr() cirrus_vga: rename cirrus_hook_write_gr() cirrus_vga_write_gr() cirrus_vga: rename cirrus_hook_read_cr() cirrus_vga_read_cr() cirrus_vga: rename cirrus_hook_write_cr() cirrus_vga_write_cr() cirrus_vga: CIRRUS_HOOK_* is not used anymore Makefile.target | 9 +- hw/cirrus_vga.c | 532 +++++++++++++++++++++++----------------------------- hw/vga-isa-mm.c | 130 +++++++++++++ hw/vga-isa.c | 50 +++++ hw/vga-pci.c | 164 ++++++++++++++++ hw/vga.c | 357 ++++++------------------------------ hw/vga_int.h | 10 +- hw/vga_template.h | 20 +- hw/vmware_vga.c | 1 + 9 files changed, 662 insertions(+), 611 deletions(-) create mode 100644 hw/vga-isa-mm.c create mode 100644 hw/vga-isa.c create mode 100644 hw/vga-pci.c