* [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout
@ 2014-06-25 20:19 Don Slutz
2014-06-25 20:23 ` Slutz, Donald Christopher
2014-06-26 6:15 ` Michael S. Tsirkin
0 siblings, 2 replies; 3+ messages in thread
From: Don Slutz @ 2014-06-25 20:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Don Slutz, Anthony Liguori, Michael S. Tsirkin
This will prevent correct migration from QEMU 1.7.0 for these
machine types when -m 3.5G is specified.
Paolo Bonzini asked that:
smbios_legacy_mode = true;
has_reserved_memory = false;
option_rom_has_mr = true;
rom_file_has_mr = false;
also be done.
Signed-off-by: Don Slutz <dslutz@verizon.com>
---
No idea how to test Paolo's changes. But they look good to me and
compile cleanly.
hw/i386/pc_piix.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 47546b7..2dccb34 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -392,6 +392,11 @@ static void pc_init_pci_no_kvmclock(MachineState *machine)
has_pci_info = false;
has_acpi_build = false;
smbios_defaults = false;
+ gigabyte_align = false;
+ smbios_legacy_mode = true;
+ has_reserved_memory = false;
+ option_rom_has_mr = true;
+ rom_file_has_mr = false;
x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
enable_compat_apic_id_mode();
pc_init1(machine, 1, 0);
@@ -402,6 +407,11 @@ static void pc_init_isa(MachineState *machine)
has_pci_info = false;
has_acpi_build = false;
smbios_defaults = false;
+ gigabyte_align = false;
+ smbios_legacy_mode = true;
+ has_reserved_memory = false;
+ option_rom_has_mr = true;
+ rom_file_has_mr = false;
if (!machine->cpu_model) {
machine->cpu_model = "486";
}
--
1.8.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout
2014-06-25 20:19 [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout Don Slutz
@ 2014-06-25 20:23 ` Slutz, Donald Christopher
2014-06-26 6:15 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Slutz, Donald Christopher @ 2014-06-25 20:23 UTC (permalink / raw)
To: Slutz, Donald Christopher
Cc: Paolo Bonzini, qemu-devel, Anthony Liguori, Michael S. Tsirkin
So how the commit message change:
On 06/25/14 16:19, Don Slutz wrote:
> This will prevent correct migration from QEMU 1.7.0 for these
> machine types when -m 3.5G is specified.
This fixes bug:
https://bugs.launchpad.net/qemu/+bug/1334307
> Paolo Bonzini asked that:
>
> smbios_legacy_mode = true;
> has_reserved_memory = false;
> option_rom_has_mr = true;
> rom_file_has_mr = false;
>
> also be done.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> ---
>
> No idea how to test Paolo's changes. But they look good to me and
> compile cleanly.
got lost. :(
-Don Slutz
> hw/i386/pc_piix.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 47546b7..2dccb34 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -392,6 +392,11 @@ static void pc_init_pci_no_kvmclock(MachineState *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
> enable_compat_apic_id_mode();
> pc_init1(machine, 1, 0);
> @@ -402,6 +407,11 @@ static void pc_init_isa(MachineState *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> if (!machine->cpu_model) {
> machine->cpu_model = "486";
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout
2014-06-25 20:19 [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout Don Slutz
2014-06-25 20:23 ` Slutz, Donald Christopher
@ 2014-06-26 6:15 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2014-06-26 6:15 UTC (permalink / raw)
To: Don Slutz; +Cc: Paolo Bonzini, qemu-devel, Anthony Liguori
On Wed, Jun 25, 2014 at 04:19:07PM -0400, Don Slutz wrote:
> This will prevent correct migration from QEMU 1.7.0 for these
> machine types when -m 3.5G is specified.
>
> Paolo Bonzini asked that:
>
> smbios_legacy_mode = true;
> has_reserved_memory = false;
> option_rom_has_mr = true;
> rom_file_has_mr = false;
>
> also be done.
>
> Signed-off-by: Don Slutz <dslutz@verizon.com>
I tweaked commit log so it's readable without
the subject.
Applied, thanks everyone.
> ---
>
> No idea how to test Paolo's changes. But they look good to me and
> compile cleanly.
>
> hw/i386/pc_piix.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 47546b7..2dccb34 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -392,6 +392,11 @@ static void pc_init_pci_no_kvmclock(MachineState *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);
> enable_compat_apic_id_mode();
> pc_init1(machine, 1, 0);
> @@ -402,6 +407,11 @@ static void pc_init_isa(MachineState *machine)
> has_pci_info = false;
> has_acpi_build = false;
> smbios_defaults = false;
> + gigabyte_align = false;
> + smbios_legacy_mode = true;
> + has_reserved_memory = false;
> + option_rom_has_mr = true;
> + rom_file_has_mr = false;
> if (!machine->cpu_model) {
> machine->cpu_model = "486";
> }
> --
> 1.8.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-26 6:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-25 20:19 [Qemu-devel] [BUGFIX][PATCH 1/1] pc: Make isapc and pc-0.10 to pc-0.13 have 1.7.0 memory layout Don Slutz
2014-06-25 20:23 ` Slutz, Donald Christopher
2014-06-26 6:15 ` Michael S. Tsirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.