]> xenbits.xensource.com Git - people/liuw/qemu.git/commitdiff
pc: Remove redundant code from pc-*-2.3 machine classes
authorEduardo Habkost <ehabkost@redhat.com>
Mon, 30 Nov 2015 14:56:35 +0000 (12:56 -0200)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 22 Dec 2015 16:39:19 +0000 (18:39 +0200)
Remove the redundant 'alias = NULL' and 'is_default = 0' lines
from older machine-types. pc_*_2_4_machine_options() already
clear those fields, so they don't need to be cleared by
pc_*_2_3_machine_options().

Reviewed-by: Marcel Apfelbaum <marcel@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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
hw/i386/pc_piix.c
hw/i386/pc_q35.c

index 9654628f09a38da833ca22c79862fa09ab8949c9..d9b9ce823b876a9c77ee45a5ee42bfbc9f1ef41a 100644 (file)
@@ -448,8 +448,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m)
 {
     pc_i440fx_2_4_machine_options(m);
     m->hw_version = "2.3.0";
-    m->alias = NULL;
-    m->is_default = 0;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_3);
 }
 
index 942ef7e478bfcf6d86b766de2108df029777a936..f3a3595246f3a00ea4f05441524e84bb46c69cdc 100644 (file)
@@ -378,7 +378,6 @@ static void pc_q35_2_3_machine_options(MachineClass *m)
     m->hw_version = "2.3.0";
     m->no_floppy = 0;
     m->no_tco = 1;
-    m->alias = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_3);
 }