Revision a90d4690

b/Makefile.target
231 231
# Hardware support
232 232
obj-i386-y += vga.o
233 233
obj-i386-y += mc146818rtc.o i8259.o pc.o
234
obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o
234
obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o
235 235
obj-i386-y += vmport.o
236 236
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
237 237
obj-i386-y += debugcon.o multiboot.o
b/hw/pc.c
1070 1070
            isa_vga_init();
1071 1071
        }
1072 1072
    }
1073

  
1074
    /*
1075
     * sga does not suppress normal vga output. So a machine can have both a
1076
     * vga card and sga manually enabled. Output will be seen on both.
1077
     * For nographic case, sga is enabled at all times
1078
     */
1079
    if (display_type == DT_NOGRAPHIC) {
1080
        isa_create_simple("sga");
1081
    }
1073 1082
}
1074 1083

  
1075 1084
static void cpu_request_exit(void *opaque, int irq, int level)
b/hw/sga.c
1
/*
2
 * QEMU dummy ISA device for loading sgabios option rom.
3
 *
4
 * Copyright (c) 2011 Glauber Costa, Red Hat Inc.
5
 *
6
 * Permission is hereby granted, free of charge, to any person obtaining a copy
7
 * of this software and associated documentation files (the "Software"), to deal
8
 * in the Software without restriction, including without limitation the rights
9
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
 * copies of the Software, and to permit persons to whom the Software is
11
 * furnished to do so, subject to the following conditions:
12
 *
13
 * The above copyright notice and this permission notice shall be included in
14
 * all copies or substantial portions of the Software.
15
 *
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
19
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
 * THE SOFTWARE.
23
 *
24
 * sgabios code originally available at code.google.com/p/sgabios
25
 *
26
 */
27
#include "pci.h"
28
#include "pc.h"
29
#include "loader.h"
30
#include "sysemu.h"
31

  
32
#define SGABIOS_FILENAME "sgabios.bin"
33

  
34
typedef struct ISAGAState {
35
    ISADevice dev;
36
} ISASGAState;
37

  
38
static int isa_cirrus_vga_initfn(ISADevice *dev)
39
{
40
    rom_add_vga(SGABIOS_FILENAME);
41
    return 0;
42
}
43

  
44
static ISADeviceInfo sga_info = {
45
    .qdev.name    = "sga",
46
    .qdev.desc    = "Serial Graphics Adapter",
47
    .qdev.size    = sizeof(ISASGAState),
48
    .init         = isa_cirrus_vga_initfn,
49
};
50

  
51
static void sga_register(void)
52
{
53
      isa_qdev_register(&sga_info);
54
}
55

  
56
device_init(sga_register);

Also available in: Unified diff