Revision f8c457b8 hw/i386/pc_piix.c
| b/hw/i386/pc_piix.c | ||
|---|---|---|
| 57 | 57 |
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
|
| 58 | 58 |
|
| 59 | 59 |
static bool has_pvpanic = true; |
| 60 |
static bool has_pci_info = true; |
|
| 60 | 61 |
|
| 61 | 62 |
/* PC hardware initialisation */ |
| 62 | 63 |
static void pc_init1(MemoryRegion *system_memory, |
| ... | ... | |
| 126 | 127 |
} |
| 127 | 128 |
|
| 128 | 129 |
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size); |
| 130 |
guest_info->has_pci_info = has_pci_info; |
|
| 129 | 131 |
|
| 130 | 132 |
/* Set PCI window size the way seabios has always done it. */ |
| 131 | 133 |
/* Power of 2 so bios can cover it with a single MTRR */ |
| ... | ... | |
| 260 | 262 |
initrd_filename, cpu_model, 1, 1); |
| 261 | 263 |
} |
| 262 | 264 |
|
| 265 |
static void pc_init_pci_1_5(QEMUMachineInitArgs *args) |
|
| 266 |
{
|
|
| 267 |
has_pci_info = false; |
|
| 268 |
pc_init_pci(args); |
|
| 269 |
} |
|
| 270 |
|
|
| 263 | 271 |
static void pc_init_pci_1_4(QEMUMachineInitArgs *args) |
| 264 | 272 |
{
|
| 273 |
has_pci_info = false; |
|
| 265 | 274 |
has_pvpanic = false; |
| 266 | 275 |
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
|
| 267 | 276 |
pc_init_pci(args); |
| ... | ... | |
| 269 | 278 |
|
| 270 | 279 |
static void pc_init_pci_1_3(QEMUMachineInitArgs *args) |
| 271 | 280 |
{
|
| 281 |
has_pci_info = false; |
|
| 272 | 282 |
enable_compat_apic_id_mode(); |
| 273 | 283 |
has_pvpanic = false; |
| 274 | 284 |
pc_init_pci(args); |
| ... | ... | |
| 277 | 287 |
/* PC machine init function for pc-1.1 to pc-1.2 */ |
| 278 | 288 |
static void pc_init_pci_1_2(QEMUMachineInitArgs *args) |
| 279 | 289 |
{
|
| 290 |
has_pci_info = false; |
|
| 280 | 291 |
disable_kvm_pv_eoi(); |
| 281 | 292 |
enable_compat_apic_id_mode(); |
| 282 | 293 |
has_pvpanic = false; |
| ... | ... | |
| 286 | 297 |
/* PC machine init function for pc-0.14 to pc-1.0 */ |
| 287 | 298 |
static void pc_init_pci_1_0(QEMUMachineInitArgs *args) |
| 288 | 299 |
{
|
| 300 |
has_pci_info = false; |
|
| 289 | 301 |
disable_kvm_pv_eoi(); |
| 290 | 302 |
enable_compat_apic_id_mode(); |
| 291 | 303 |
has_pvpanic = false; |
| ... | ... | |
| 302 | 314 |
const char *initrd_filename = args->initrd_filename; |
| 303 | 315 |
const char *boot_device = args->boot_device; |
| 304 | 316 |
has_pvpanic = false; |
| 317 |
has_pci_info = false; |
|
| 305 | 318 |
disable_kvm_pv_eoi(); |
| 306 | 319 |
enable_compat_apic_id_mode(); |
| 307 | 320 |
pc_init1(get_system_memory(), |
| ... | ... | |
| 320 | 333 |
const char *initrd_filename = args->initrd_filename; |
| 321 | 334 |
const char *boot_device = args->boot_device; |
| 322 | 335 |
has_pvpanic = false; |
| 336 |
has_pci_info = false; |
|
| 323 | 337 |
if (cpu_model == NULL) |
| 324 | 338 |
cpu_model = "486"; |
| 325 | 339 |
disable_kvm_pv_eoi(); |
| ... | ... | |
| 359 | 373 |
static QEMUMachine pc_i440fx_machine_v1_5 = {
|
| 360 | 374 |
.name = "pc-i440fx-1.5", |
| 361 | 375 |
.desc = "Standard PC (i440FX + PIIX, 1996)", |
| 362 |
.init = pc_init_pci, |
|
| 376 |
.init = pc_init_pci_1_5,
|
|
| 363 | 377 |
.hot_add_cpu = pc_hot_add_cpu, |
| 364 | 378 |
.max_cpus = 255, |
| 365 | 379 |
.compat_props = (GlobalProperty[]) {
|
Also available in: Unified diff