[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/22] q35: Move options common to all classes to pc_
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 04/22] q35: Move options common to all classes to pc_i440fx_machine_options() |
Date: |
Thu, 24 Sep 2015 16:20:15 +0300 |
From: Eduardo Habkost <address@hidden>
The existing default_machine_opts and default_display settings will
still apply to future machine classes. So it makes sense to move them to
pc_i440fx_machine_options() instead of keeping them in a
version-specific machine_options function.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc_piix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 3f925b2..2d9df7c 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -460,6 +460,8 @@ static void pc_i440fx_machine_options(MachineClass *m)
m->family = "pc_piix";
m->desc = "Standard PC (i440FX + PIIX, 1996)";
m->hot_add_cpu = pc_hot_add_cpu;
+ m->default_machine_opts = "firmware=bios-256k.bin";
+ m->default_display = "std";
}
static void pc_i440fx_2_4_machine_options(MachineClass *m)
@@ -467,8 +469,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_machine_options(m);
pcmc->broken_reserved_end = true;
- m->default_machine_opts = "firmware=bios-256k.bin";
- m->default_display = "std";
m->alias = "pc";
m->is_default = 1;
}
--
MST
- [Qemu-devel] [PULL 00/22] virtio,pc features, fixes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 03/22] q35: Move options common to all classes to pc_q35_machine_options(), Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 02/22] virtio-net: unbreak self announcement and guest offloads after migration, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 04/22] q35: Move options common to all classes to pc_i440fx_machine_options(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/22] pc: Introduce pc-*-2.5 machine classes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 06/22] virtio: ring sizes vs. reset, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 07/22] virtio-ccw: support ring size changes, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 08/22] virtio-ccw: feature bits > 31 handling, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 09/22] virtio-ccw: enable virtio-1, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 10/22] vhost-user: use VHOST_USER_XXX macro for switch statement, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 11/22] vhost-user: add protocol feature negotiation, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 12/22] vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 19/22] MAINTAINERS: add more devices to the PCI section, Michael S. Tsirkin, 2015/09/24
- [Qemu-devel] [PULL 21/22] virtio: introduce virtqueue_discard(), Michael S. Tsirkin, 2015/09/24