pc.c (565f65d2) pc.c (e35704ba)
1/*
2 * QEMU PC System Emulator
3 *
4 * Copyright (c) 2003-2004 Fabrice Bellard
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

--- 27 unchanged lines hidden (view full) ---

36#include "elf.h"
37#include "multiboot.h"
38#include "hw/timer/mc146818rtc.h"
39#include "hw/timer/i8254.h"
40#include "hw/audio/pcspk.h"
41#include "hw/pci/msi.h"
42#include "hw/sysbus.h"
43#include "sysemu/sysemu.h"
1/*
2 * QEMU PC System Emulator
3 *
4 * Copyright (c) 2003-2004 Fabrice Bellard
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

--- 27 unchanged lines hidden (view full) ---

36#include "elf.h"
37#include "multiboot.h"
38#include "hw/timer/mc146818rtc.h"
39#include "hw/timer/i8254.h"
40#include "hw/audio/pcspk.h"
41#include "hw/pci/msi.h"
42#include "hw/sysbus.h"
43#include "sysemu/sysemu.h"
44#include "sysemu/numa.h"
44#include "sysemu/kvm.h"
45#include "kvm_i386.h"
46#include "hw/xen/xen.h"
47#include "sysemu/block-backend.h"
48#include "hw/block/block.h"
49#include "ui/qemu-spice.h"
50#include "exec/memory.h"
51#include "exec/address-spaces.h"

--- 357 unchanged lines hidden (view full) ---

409 (Object **)&pc_machine->rtc,
410 object_property_allow_set_link,
411 OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
412 object_property_set_link(OBJECT(machine), OBJECT(s),
413 "rtc_state", &error_abort);
414
415 set_boot_dev(s, boot_device, &local_err);
416 if (local_err) {
45#include "sysemu/kvm.h"
46#include "kvm_i386.h"
47#include "hw/xen/xen.h"
48#include "sysemu/block-backend.h"
49#include "hw/block/block.h"
50#include "ui/qemu-spice.h"
51#include "exec/memory.h"
52#include "exec/address-spaces.h"

--- 357 unchanged lines hidden (view full) ---

410 (Object **)&pc_machine->rtc,
411 object_property_allow_set_link,
412 OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
413 object_property_set_link(OBJECT(machine), OBJECT(s),
414 "rtc_state", &error_abort);
415
416 set_boot_dev(s, boot_device, &local_err);
417 if (local_err) {
417 error_report_err(local_err);
418 error_report("%s", error_get_pretty(local_err));
418 exit(1);
419 }
420
421 /* floppy type */
422 if (floppy) {
423 for (i = 0; i < 2; i++) {
424 fd_type[i] = isa_fdc_get_drive_type(floppy, i);
425 }

--- 609 unchanged lines hidden (view full) ---

1035 apic_id_limit - 1);
1036 exit(1);
1037 }
1038
1039 for (i = 0; i < smp_cpus; i++) {
1040 cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),
1041 icc_bridge, &error);
1042 if (error) {
419 exit(1);
420 }
421
422 /* floppy type */
423 if (floppy) {
424 for (i = 0; i < 2; i++) {
425 fd_type[i] = isa_fdc_get_drive_type(floppy, i);
426 }

--- 609 unchanged lines hidden (view full) ---

1036 apic_id_limit - 1);
1037 exit(1);
1038 }
1039
1040 for (i = 0; i < smp_cpus; i++) {
1041 cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),
1042 icc_bridge, &error);
1043 if (error) {
1043 error_report_err(error);
1044 error_report("%s", error_get_pretty(error));
1045 error_free(error);
1044 exit(1);
1045 }
1046 }
1047
1048 /* map APIC MMIO area if CPU has APIC */
1049 if (cpu && cpu->apic_state) {
1050 /* XXX: what if the base changes? */
1051 sysbus_mmio_map_overlap(SYS_BUS_DEVICE(icc_bridge), 0,

--- 781 unchanged lines hidden --- 		1046 exit(1);
1047 }
1048 }
1049
1050 /* map APIC MMIO area if CPU has APIC */
1051 if (cpu && cpu->apic_state) {
1052 /* XXX: what if the base changes? */
1053 sysbus_mmio_map_overlap(SYS_BUS_DEVICE(icc_bridge), 0,

--- 781 unchanged lines hidden ---