Revision 0ec329da hw/pc_piix.c
| b/hw/pc_piix.c | ||
|---|---|---|
| 32 | 32 |
#include "boards.h" |
| 33 | 33 |
#include "ide.h" |
| 34 | 34 |
#include "kvm.h" |
| 35 |
#include "kvmclock.h" |
|
| 35 | 36 |
#include "sysemu.h" |
| 36 | 37 |
#include "sysbus.h" |
| 37 | 38 |
#include "arch_init.h" |
| ... | ... | |
| 66 | 67 |
const char *kernel_cmdline, |
| 67 | 68 |
const char *initrd_filename, |
| 68 | 69 |
const char *cpu_model, |
| 69 |
int pci_enabled) |
|
| 70 |
int pci_enabled, |
|
| 71 |
int kvmclock_enabled) |
|
| 70 | 72 |
{
|
| 71 | 73 |
int i; |
| 72 | 74 |
ram_addr_t below_4g_mem_size, above_4g_mem_size; |
| ... | ... | |
| 86 | 88 |
|
| 87 | 89 |
pc_cpus_init(cpu_model); |
| 88 | 90 |
|
| 91 |
if (kvmclock_enabled) {
|
|
| 92 |
kvmclock_create(); |
|
| 93 |
} |
|
| 94 |
|
|
| 89 | 95 |
/* allocate ram and load rom/bios */ |
| 90 | 96 |
pc_memory_init(ram_size, kernel_filename, kernel_cmdline, initrd_filename, |
| 91 | 97 |
&below_4g_mem_size, &above_4g_mem_size); |
| ... | ... | |
| 193 | 199 |
{
|
| 194 | 200 |
pc_init1(ram_size, boot_device, |
| 195 | 201 |
kernel_filename, kernel_cmdline, |
| 196 |
initrd_filename, cpu_model, 1); |
|
| 202 |
initrd_filename, cpu_model, 1, 1); |
|
| 203 |
} |
|
| 204 |
|
|
| 205 |
static void pc_init_pci_no_kvmclock(ram_addr_t ram_size, |
|
| 206 |
const char *boot_device, |
|
| 207 |
const char *kernel_filename, |
|
| 208 |
const char *kernel_cmdline, |
|
| 209 |
const char *initrd_filename, |
|
| 210 |
const char *cpu_model) |
|
| 211 |
{
|
|
| 212 |
pc_init1(ram_size, boot_device, |
|
| 213 |
kernel_filename, kernel_cmdline, |
|
| 214 |
initrd_filename, cpu_model, 1, 0); |
|
| 197 | 215 |
} |
| 198 | 216 |
|
| 199 | 217 |
static void pc_init_isa(ram_addr_t ram_size, |
| ... | ... | |
| 207 | 225 |
cpu_model = "486"; |
| 208 | 226 |
pc_init1(ram_size, boot_device, |
| 209 | 227 |
kernel_filename, kernel_cmdline, |
| 210 |
initrd_filename, cpu_model, 0); |
|
| 228 |
initrd_filename, cpu_model, 0, 1);
|
|
| 211 | 229 |
} |
| 212 | 230 |
|
| 213 | 231 |
static QEMUMachine pc_machine = {
|
| ... | ... | |
| 222 | 240 |
static QEMUMachine pc_machine_v0_13 = {
|
| 223 | 241 |
.name = "pc-0.13", |
| 224 | 242 |
.desc = "Standard PC", |
| 225 |
.init = pc_init_pci, |
|
| 243 |
.init = pc_init_pci_no_kvmclock,
|
|
| 226 | 244 |
.max_cpus = 255, |
| 227 | 245 |
.compat_props = (GlobalProperty[]) {
|
| 228 | 246 |
{
|
| ... | ... | |
| 249 | 267 |
static QEMUMachine pc_machine_v0_12 = {
|
| 250 | 268 |
.name = "pc-0.12", |
| 251 | 269 |
.desc = "Standard PC", |
| 252 |
.init = pc_init_pci, |
|
| 270 |
.init = pc_init_pci_no_kvmclock,
|
|
| 253 | 271 |
.max_cpus = 255, |
| 254 | 272 |
.compat_props = (GlobalProperty[]) {
|
| 255 | 273 |
{
|
| ... | ... | |
| 280 | 298 |
static QEMUMachine pc_machine_v0_11 = {
|
| 281 | 299 |
.name = "pc-0.11", |
| 282 | 300 |
.desc = "Standard PC, qemu 0.11", |
| 283 |
.init = pc_init_pci, |
|
| 301 |
.init = pc_init_pci_no_kvmclock,
|
|
| 284 | 302 |
.max_cpus = 255, |
| 285 | 303 |
.compat_props = (GlobalProperty[]) {
|
| 286 | 304 |
{
|
| ... | ... | |
| 319 | 337 |
static QEMUMachine pc_machine_v0_10 = {
|
| 320 | 338 |
.name = "pc-0.10", |
| 321 | 339 |
.desc = "Standard PC, qemu 0.10", |
| 322 |
.init = pc_init_pci, |
|
| 340 |
.init = pc_init_pci_no_kvmclock,
|
|
| 323 | 341 |
.max_cpus = 255, |
| 324 | 342 |
.compat_props = (GlobalProperty[]) {
|
| 325 | 343 |
{
|
Also available in: Unified diff