diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-05-27 16:46:01 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-06-03 15:41:27 +0000 |
| commit | 9cdf79d068f52f7de347cb45cfd8903519410e4d (patch) | |
| tree | 37d82c304a6e4e14b800e6d92bf3699f504a08a5 /hw/i386 | |
| parent | 95222d0945ac8e7fea2adf2fc927634ff3ea1389 (diff) | |
| download | qemu-9cdf79d068f52f7de347cb45cfd8903519410e4d.tar.gz qemu-9cdf79d068f52f7de347cb45cfd8903519410e4d.tar.bz2 qemu-9cdf79d068f52f7de347cb45cfd8903519410e4d.zip | |
xen: use pc_init_pci instead of pc_init_pci_no_kvmclock
Call kvmclock_create only if kvmclock_enabled.
Use pc_init_pci on Xen rather than pc_init_pci_no_kvmclock.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 742544e734..2653502c08 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -98,7 +98,7 @@ static void pc_init1(MemoryRegion *system_memory, pc_cpus_init(cpu_model, icc_bridge); pc_acpi_init("acpi-dsdt.aml"); - if (kvmclock_enabled) { + if (kvm_enabled() && kvmclock_enabled) { kvmclock_create(); } @@ -323,7 +323,7 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) if (xen_hvm_init() != 0) { hw_error("xen hardware virtual machine initialisation failed"); } - pc_init_pci_no_kvmclock(args); + pc_init_pci(args); } #endif |