[PATCH] KVM: Qemu: Fix ia64 boot failure and build issue.
"Zhang, Xiantao" <[email protected]>
| Newsgroups | org.kernel.vger.kvm-ia64,org.kernel.vger.kvm |
|---|---|
| Message-ID | <706158FABBBA044BAD4FE898A02E4BC23281BA54@pdsmsx503.ccr.corp.intel.com> |
commit 30a96c404b41d4091781c33cfdf5384a7b6b655e Author: Xiantao Zhang <[email protected]> Date: Tue Apr 7 09:58:25 2009 -0400 KVM: Qemu: Fix ia64 boot failure and build issue. 1. Remove vga_bios_init for arch ia64, and doesn't need it now. 2. Fix build issue due to lacking of header file. Signed-off-by: Xiantao Zhang <[email protected]> diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c index 4a081ce..381d7fd 100644 --- a/qemu/hw/vga.c +++ b/qemu/hw/vga.c @@ -2320,140 +2320,6 @@ static void vga_map(PCIDevice *pci_dev, int region_num, vga_dirty_log_start(s); } -#ifdef TARGET_IA64 -/* do the same job as vgabios before vgabios get ready - yeah */ -void vga_bios_init(VGAState *s) -{ - uint8_t palette_model[192] = { - 0, 0, 0, 0, 0, 170, 0, 170, - 0, 0, 170, 170, 170, 0, 0, 170, - 0, 170, 170, 85, 0, 170, 170, 170, - 85, 85, 85, 85, 85, 255, 85, 255, - 85, 85, 255, 255, 255, 85, 85, 255, - 85, 255, 255, 255, 85, 255, 255, 255, - 0, 21, 0, 0, 21, 42, 0, 63, - 0, 0, 63, 42, 42, 21, 0, 42, - 21, 42, 42, 63, 0, 42, 63, 42, - 0, 21, 21, 0, 21, 63, 0, 63, - 21, 0, 63, 63, 42, 21, 21, 42, - 21, 63, 42, 63, 21, 42, 63, 63, - 21, 0, 0, 21, 0, 42, 21, 42, - 0, 21, 42, 42, 63, 0, 0, 63, - 0, 42, 63, 42, 0, 63, 42, 42, - 21, 0, 21, 21, 0, 63, 21, 42, - 21, 21, 42, 63, 63, 0, 21, 63, - 0, 63, 63, 42, 21, 63, 42, 63, - 21, 21, 0, 21, 21, 42, 21, 63, - 0, 21, 63, 42, 63, 21, 0, 63, - 21, 42, 63, 63, 0, 63, 63, 42, - 21, 21, 21, 21, 21, 63, 21, 63, - 21, 21, 63, 63, 63, 21, 21, 63, - 21, 63, 63, 63, 21, 63, 63, 63 - }; - - s->latch = 0; - - s->sr_index = 3; - s->sr[0] = 3; - s->sr[1] = 0; - s->sr[2] = 3; - s->sr[3] = 0; - s->sr[4] = 2; - s->sr[5] = 0; - s->sr[6] = 0; - s->sr[7] = 0; - - s->gr_index = 5; - s->gr[0] = 0; - s->gr[1] = 0; - s->gr[2] = 0; - s->gr[3] = 0; - s->gr[4] = 0; - s->gr[5] = 16; - s->gr[6] = 14; - s->gr[7] = 15; - s->gr[8] = 255; - - /* changed by out 0x03c0 */ - s->ar_index = 32; - s->ar[0] = 0; - s->ar[1] = 1; - s->ar[2] = 2; - s->ar[3] = 3; - s->ar[4] = 4; - s->ar[5] = 5; - s->ar[6] = 6; - s->ar[7] = 7; - s->ar[8] = 8; - s->ar[9] = 9; - s->ar[10] = 10; - s->ar[11] = 11; - s->ar[12] = 12; - s->ar[13] = 13; - s->ar[14] = 14; - s->ar[15] = 15; - s->ar[16] = 12; - s->ar[17] = 0; - s->ar[18] = 15; - s->ar[19] = 8; - s->ar[20] = 0; - - s->ar_flip_flop = 1; - - s->cr_index = 15; - s->cr[0] = 95; - s->cr[1] = 79; - s->cr[2] = 80; - s->cr[3] = 130; - s->cr[4] = 85; - s->cr[5] = 129; - s->cr[6] = 191; - s->cr[7] = 31; - s->cr[8] = 0; - s->cr[9] = 79; - s->cr[10] = 14; - s->cr[11] = 15; - s->cr[12] = 0; - s->cr[13] = 0; - s->cr[14] = 5; - s->cr[15] = 160; - s->cr[16] = 156; - s->cr[17] = 142; - s->cr[18] = 143; - s->cr[19] = 40; - s->cr[20] = 31; - s->cr[21] = 150; - s->cr[22] = 185; - s->cr[23] = 163; - s->cr[24] = 255; - - s->msr = 103; - s->fcr = 0; - s->st00 = 0; - s->st01 = 0; - - /* dac_* & palette will be initialized by os through out 0x03c8 & - * out 0c03c9(1:3) */ - s->dac_state = 0; - s->dac_sub_index = 0; - s->dac_read_index = 0; - s->dac_write_index = 16; - s->dac_cache[0] = 255; - s->dac_cache[1] = 255; - s->dac_cache[2] = 255; - - /* palette */ - memcpy(s->palette, palette_model, 192); - - s->bank_offset = 0; - s->graphic_mode = -1; - - vga_update_resolution(s); - - /* TODO: add vbe support if enabled */ -} -#endif - void vga_common_init(VGAState *s, uint8_t *vga_ram_base, ram_addr_t vga_ram_offset, int vga_ram_size) { @@ -2504,9 +2370,6 @@ void vga_common_init(VGAState *s, uint8_t *vga_ram_base, break; } vga_reset(s); -#ifdef TARGET_IA64 - vga_bios_init(s); -#endif } /* used by both ISA and PCI */ diff --git a/qemu/monitor.c b/qemu/monitor.c index b3ea22a..a363677 100644 --- a/qemu/monitor.c +++ b/qemu/monitor.c @@ -42,6 +42,7 @@ #include "migration.h" #include "kvm.h" #include "acl.h" +#include "exec-all.h" #include "qemu-kvm.h"
fix-ia64.patch
(application/octet-stream, 4.4 KB)
commit 30a96c404b41d4091781c33cfdf5384a7b6b655e Author: Xiantao Zhang <[email protected]> Date: Tue Apr 7 09:58:25 2009 -0400 KVM: Qemu: Fix ia64 boot failure and build issue. 1. Remove vga_bios_init for arch ia64, and doesn't need it now. 2. Fix build issue due to lacking of header file. Signed-off-by: Xiantao Zhang <[email protected]> diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c index 4a081ce..381d7fd 100644 --- a/qemu/hw/vga.c +++ b/qemu/hw/vga.c @@ -2320,140 +2320,6 @@ static void vga_map(PCIDevice *pci_dev, int region_num, vga_dirty_log_start(s); } -#ifdef TARGET_IA64 -/* do the same job as vgabios before vgabios get ready - yeah */ -void vga_bios_init(VGAState *s) -{ - uint8_t palette_model[192] = { - 0, 0, 0, 0, 0, 170, 0, 170, - 0, 0, 170, 170, 170, 0, 0, 170, - 0, 170, 170, 85, 0, 170, 170, 170, - 85, 85, 85, 85, 85, 255, 85, 255, - 85, 85, 255, 255, 255, 85, 85, 255, - 85, 255, 255, 255, 85, 255, 255, 255, - 0, 21, 0, 0, 21, 42, 0, 63, - 0, 0, 63, 42, 42, 21, 0, 42, - 21, 42, 42, 63, 0, 42, 63, 42, - 0, 21, 21, 0, 21, 63, 0, 63, - 21, 0, 63, 63, 42, 21, 21, 42, - 21, 63, 42, 63, 21, 42, 63, 63, - 21, 0, 0, 21, 0, 42, 21, 42, - 0, 21, 42, 42, 63, 0, 0, 63, - 0, 42, 63, 42, 0, 63, 42, 42, - 21, 0, 21, 21, 0, 63, 21, 42, - 21, 21, 42, 63, 63, 0, 21, 63, - 0, 63, 63, 42, 21, 63, 42, 63, - 21, 21, 0, 21, 21, 42, 21, 63, - 0, 21, 63, 42, 63, 21, 0, 63, - 21, 42, 63, 63, 0, 63, 63, 42, - 21, 21, 21, 21, 21, 63, 21, 63, - 21, 21, 63, 63, 63, 21, 21, 63, - 21, 63, 63, 63, 21, 63, 63, 63 - }; - - s->latch = 0; - - s->sr_index = 3; - s->sr[0] = 3; - s->sr[1] = 0; - s->sr[2] = 3; - s->sr[3] = 0; - s->sr[4] = 2; - s->sr[5] = 0; - s->sr[6] = 0; - s->sr[7] = 0; - - s->gr_index = 5; - s->gr[0] = 0; - s->gr[1] = 0; - s->gr[2] = 0; - s->gr[3] = 0; - s->gr[4] = 0; - s->gr[5] = 16; - s->gr[6] = 14; - s->gr[7] = 15; - s->gr[8] = 255; - - /* changed by out 0x03c0 */ - s->ar_index = 32; - s->ar[0] = 0; - s->ar[1] = 1; - s->ar[2] = 2; - s->ar[3] = 3; - s->ar[4] = 4; - s->ar[5] = 5; - s->ar[6] = 6; - s->ar[7] = 7; - s->ar[8] = 8; - s->ar[9] = 9; - s->ar[10] = 10; - s->ar[11] = 11; - s->ar[12] = 12; - s->ar[13] = 13; - s->ar[14] = 14; - s->ar[15] = 15; - s->ar[16] = 12; - s->ar[17] = 0; - s->ar[18] = 15; - s->ar[19] = 8; - s->ar[20] = 0; - - s->ar_flip_flop = 1; - - s->cr_index = 15; - s->cr[0] = 95; - s->cr[1] = 79; - s->cr[2] = 80; - s->cr[3] = 130; - s->cr[4] = 85; - s->cr[5] = 129; - s->cr[6] = 191; - s->cr[7] = 31; - s->cr[8] = 0; - s->cr[9] = 79; - s->cr[10] = 14; - s->cr[11] = 15; - s->cr[12] = 0; - s->cr[13] = 0; - s->cr[14] = 5; - s->cr[15] = 160; - s->cr[16] = 156; - s->cr[17] = 142; - s->cr[18] = 143; - s->cr[19] = 40; - s->cr[20] = 31; - s->cr[21] = 150; - s->cr[22] = 185; - s->cr[23] = 163; - s->cr[24] = 255; - - s->msr = 103; - s->fcr = 0; - s->st00 = 0; - s->st01 = 0; - - /* dac_* & palette will be initialized by os through out 0x03c8 & - * out 0c03c9(1:3) */ - s->dac_state = 0; - s->dac_sub_index = 0; - s->dac_read_index = 0; - s->dac_write_index = 16; - s->dac_cache[0] = 255; - s->dac_cache[1] = 255; - s->dac_cache[2] = 255; - - /* palette */ - memcpy(s->palette, palette_model, 192); - - s->bank_offset = 0; - s->graphic_mode = -1; - - vga_update_resolution(s); - - /* TODO: add vbe support if enabled */ -} -#endif - void vga_common_init(VGAState *s, uint8_t *vga_ram_base, ram_addr_t vga_ram_offset, int vga_ram_size) { @@ -2504,9 +2370,6 @@ void vga_common_init(VGAState *s, uint8_t *vga_ram_base, break; } vga_reset(s); -#ifdef TARGET_IA64 - vga_bios_init(s); -#endif } /* used by both ISA and PCI */ diff --git a/qemu/monitor.c b/qemu/monitor.c index b3ea22a..a363677 100644 --- a/qemu/monitor.c +++ b/qemu/monitor.c @@ -42,6 +42,7 @@ #include "migration.h" #include "kvm.h" #include "acl.h" +#include "exec-all.h" #include "qemu-kvm.h"