From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 12 Nov 2015 17:29:55 +0000 (-0200)
Subject: pc: Don't set hw_version on pc-*-2.5
X-Git-Tag: v2.5.0-rc2~1^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=463b52f285164ec3dc0649763e06e40cea9e8a1f;p=thirdparty%2Fqemu.git

pc: Don't set hw_version on pc-*-2.5

Now that qemu_hw_version() returns a fixed "2.5+" string instead
of QEMU_VERSION, we don't need to set hw_version on pc-*-2.5
explicitly.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 07d0baa0fb2..2e41efe1b43 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -472,7 +472,6 @@ static void pc_i440fx_machine_options(MachineClass *m)
 static void pc_i440fx_2_5_machine_options(MachineClass *m)
 {
     pc_i440fx_machine_options(m);
-    m->hw_version = QEMU_VERSION;
     m->alias = "pc";
     m->is_default = 1;
 }
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 0fdae09bdb3..133bc68faca 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -373,7 +373,6 @@ static void pc_q35_machine_options(MachineClass *m)
 static void pc_q35_2_5_machine_options(MachineClass *m)
 {
     pc_q35_machine_options(m);
-    m->hw_version = QEMU_VERSION;
     m->alias = "q35";
 }