|
 |
9ae3a8 |
From 9eb0daf6079beade2bcc13d0062d90a7644685f5 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 31 Jul 2013 08:04:35 +0200
|
|
|
9ae3a8 |
Subject: pc: Give rhel6.0.0 a kvmclock
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1375201922-6794-10-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 52817
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 PATCH v3 09/15] pc: Give rhel6.0.0 a kvmclock
|
|
|
9ae3a8 |
Bugzilla: 983991
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RHEL-6.0 inherited kvmclock from upstream qemu-kvm. It later made its
|
|
|
9ae3a8 |
way into upstream qemu (commit 0ec329d), and we switched to it in
|
|
|
9ae3a8 |
RHEL-6.2 (commit 17ca2d2).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Since kvmclock was new in upstream qemu, the commit took care to
|
|
|
9ae3a8 |
enable it only for new machine types. Since it wasn't new in RHEL-6,
|
|
|
9ae3a8 |
the backport dropped that part.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Drop it in RHEL-7, too.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index 57877e3..e48545b 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -931,20 +931,10 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void pc_init_rhel600(QEMUMachineInitArgs *args)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
- ram_addr_t ram_size = args->ram_size;
|
|
|
9ae3a8 |
- const char *cpu_model = args->cpu_model;
|
|
|
9ae3a8 |
- const char *kernel_filename = args->kernel_filename;
|
|
|
9ae3a8 |
- const char *kernel_cmdline = args->kernel_cmdline;
|
|
|
9ae3a8 |
- const char *initrd_filename = args->initrd_filename;
|
|
|
9ae3a8 |
- const char *boot_device = args->boot_device;
|
|
|
9ae3a8 |
has_pvpanic = false;
|
|
|
9ae3a8 |
disable_kvm_pv_eoi();
|
|
|
9ae3a8 |
enable_compat_apic_id_mode();
|
|
|
9ae3a8 |
- pc_init1(get_system_memory(),
|
|
|
9ae3a8 |
- get_system_io(),
|
|
|
9ae3a8 |
- ram_size, boot_device,
|
|
|
9ae3a8 |
- kernel_filename, kernel_cmdline,
|
|
|
9ae3a8 |
- initrd_filename, cpu_model, 1, 0);
|
|
|
9ae3a8 |
+ pc_init_rhel700(args);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static QEMUMachine pc_machine_rhel600 = {
|