|
 |
d81766 |
From 00ed2929b78e1c01e8bd581d0bace0ab2fdeb189 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Date: Mon, 11 Aug 2014 07:54:38 +0200
|
|
|
d81766 |
Subject: [PATCH 04/24] rhel: Suppress hotplug memory address space for machine types <=7.0
|
|
|
d81766 |
|
|
|
d81766 |
Message-id: <1407743689-13553-5-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 60505
|
|
|
d81766 |
O-Subject: [PATCH RHEV-7.1 qemu-kvm-rhev 04/15] rhel: Suppress hotplug memory address space for machine types <=7.0
|
|
|
d81766 |
Bugzilla: 1118665
|
|
|
d81766 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Update the RHEL machine types for upstream commit de268e1.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
---
|
|
|
d81766 |
hw/i386/pc_piix.c | 1 +
|
|
|
d81766 |
hw/i386/pc_q35.c | 1 +
|
|
|
d81766 |
2 files changed, 2 insertions(+)
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
d81766 |
---
|
|
|
d81766 |
hw/i386/pc_piix.c | 1 +
|
|
|
d81766 |
hw/i386/pc_q35.c | 1 +
|
|
|
d81766 |
2 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
d81766 |
index e23fb7f..e21eb72 100644
|
|
|
d81766 |
--- a/hw/i386/pc_piix.c
|
|
|
d81766 |
+++ b/hw/i386/pc_piix.c
|
|
|
d81766 |
@@ -955,6 +955,7 @@ static void pc_compat_rhel700(MachineState *machine)
|
|
|
d81766 |
CPUID_EXT2_RDTSCP);
|
|
|
d81766 |
|
|
|
d81766 |
smbios_legacy_mode = true;
|
|
|
d81766 |
+ has_reserved_memory = false;
|
|
|
d81766 |
}
|
|
|
d81766 |
|
|
|
d81766 |
/*
|
|
|
d81766 |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
d81766 |
index e433cb6..eb015aa 100644
|
|
|
d81766 |
--- a/hw/i386/pc_q35.c
|
|
|
d81766 |
+++ b/hw/i386/pc_q35.c
|
|
|
d81766 |
@@ -463,6 +463,7 @@ static void pc_q35_compat_rhel700(MachineState *machine)
|
|
|
d81766 |
CPUID_EXT2_RDTSCP);
|
|
|
d81766 |
|
|
|
d81766 |
smbios_legacy_mode = true;
|
|
|
d81766 |
+ has_reserved_memory = false;
|
|
|
d81766 |
}
|
|
|
d81766 |
|
|
|
d81766 |
static void pc_q35_init_rhel700(MachineState *machine)
|
|
|
d81766 |
--
|
|
|
d81766 |
1.7.1
|
|
|
d81766 |
|