2012-11-14 20:54:06 +00:00
|
|
|
/*
|
|
|
|
* Q35 chipset based pc system emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
|
|
* Copyright (c) 2009, 2010
|
|
|
|
* Isaku Yamahata <yamahata at valinux co jp>
|
|
|
|
* VA Linux Systems Japan K.K.
|
|
|
|
* Copyright (C) 2012 Jason Baron <jbaron@redhat.com>
|
|
|
|
*
|
|
|
|
* This is based on pc.c, but heavily modified.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/hw.h"
|
2013-08-19 14:26:55 +00:00
|
|
|
#include "hw/loader.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/arch_init.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/i2c/smbus.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/boards.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/timer/mc146818rtc.h"
|
|
|
|
#include "hw/xen/xen.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/kvm.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/kvm/clock.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/pci-host/q35.h"
|
2012-12-17 17:19:49 +00:00
|
|
|
#include "exec/address-spaces.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/i386/ich9.h"
|
2012-11-14 20:54:06 +00:00
|
|
|
#include "hw/ide/pci.h"
|
|
|
|
#include "hw/ide/ahci.h"
|
|
|
|
#include "hw/usb.h"
|
2013-04-29 15:02:50 +00:00
|
|
|
#include "hw/cpu/icc_bus.h"
|
2012-11-14 20:54:06 +00:00
|
|
|
|
|
|
|
/* ICH9 AHCI has 6 ports */
|
|
|
|
#define MAX_SATA_PORTS 6
|
|
|
|
|
2013-08-11 15:10:42 +00:00
|
|
|
static bool has_pvpanic;
|
2013-05-13 17:00:23 +00:00
|
|
|
static bool has_pci_info = true;
|
2013-04-26 03:24:46 +00:00
|
|
|
|
2012-11-14 20:54:06 +00:00
|
|
|
/* PC hardware initialisation */
|
|
|
|
static void pc_q35_init(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
ram_addr_t below_4g_mem_size, above_4g_mem_size;
|
|
|
|
Q35PCIHost *q35_host;
|
2013-07-01 10:18:22 +00:00
|
|
|
PCIHostState *phb;
|
2012-11-14 20:54:06 +00:00
|
|
|
PCIBus *host_bus;
|
|
|
|
PCIDevice *lpc;
|
|
|
|
BusState *idebus[MAX_SATA_PORTS];
|
|
|
|
ISADevice *rtc_state;
|
|
|
|
ISADevice *floppy;
|
|
|
|
MemoryRegion *pci_memory;
|
|
|
|
MemoryRegion *rom_memory;
|
|
|
|
MemoryRegion *ram_memory;
|
|
|
|
GSIState *gsi_state;
|
|
|
|
ISABus *isa_bus;
|
|
|
|
int pci_enabled = 1;
|
|
|
|
qemu_irq *cpu_irq;
|
|
|
|
qemu_irq *gsi;
|
|
|
|
qemu_irq *i8259;
|
|
|
|
int i;
|
|
|
|
ICH9LPCState *ich9_lpc;
|
|
|
|
PCIDevice *ahci;
|
2013-04-29 15:02:50 +00:00
|
|
|
DeviceState *icc_bridge;
|
2013-05-30 09:57:26 +00:00
|
|
|
PcGuestInfo *guest_info;
|
2013-04-29 15:02:50 +00:00
|
|
|
|
|
|
|
icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
|
|
|
|
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
|
|
|
OBJECT(icc_bridge), NULL);
|
2012-11-14 20:54:06 +00:00
|
|
|
|
2013-08-21 18:14:41 +00:00
|
|
|
pc_cpus_init(args->cpu_model, icc_bridge);
|
2012-12-03 09:47:27 +00:00
|
|
|
pc_acpi_init("q35-acpi-dsdt.aml");
|
2012-11-14 20:54:06 +00:00
|
|
|
|
2012-11-14 20:54:08 +00:00
|
|
|
kvmclock_create();
|
|
|
|
|
2013-08-21 18:14:41 +00:00
|
|
|
if (args->ram_size >= 0xb0000000) {
|
|
|
|
above_4g_mem_size = args->ram_size - 0xb0000000;
|
2012-11-14 20:54:06 +00:00
|
|
|
below_4g_mem_size = 0xb0000000;
|
|
|
|
} else {
|
|
|
|
above_4g_mem_size = 0;
|
2013-08-21 18:14:41 +00:00
|
|
|
below_4g_mem_size = args->ram_size;
|
2012-11-14 20:54:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* pci enabled */
|
|
|
|
if (pci_enabled) {
|
|
|
|
pci_memory = g_new(MemoryRegion, 1);
|
2013-06-06 09:41:28 +00:00
|
|
|
memory_region_init(pci_memory, NULL, "pci", INT64_MAX);
|
2012-11-14 20:54:06 +00:00
|
|
|
rom_memory = pci_memory;
|
|
|
|
} else {
|
|
|
|
pci_memory = NULL;
|
|
|
|
rom_memory = get_system_memory();
|
|
|
|
}
|
|
|
|
|
2013-05-30 09:57:26 +00:00
|
|
|
guest_info = pc_guest_info_init(below_4g_mem_size, above_4g_mem_size);
|
2013-05-13 17:00:23 +00:00
|
|
|
guest_info->has_pci_info = has_pci_info;
|
2013-08-09 17:35:02 +00:00
|
|
|
guest_info->isapc_ram_fw = false;
|
2013-05-30 09:57:26 +00:00
|
|
|
|
2012-11-14 20:54:06 +00:00
|
|
|
/* allocate ram and load rom/bios */
|
|
|
|
if (!xen_enabled()) {
|
2013-08-21 18:14:41 +00:00
|
|
|
pc_memory_init(get_system_memory(),
|
|
|
|
args->kernel_filename, args->kernel_cmdline,
|
|
|
|
args->initrd_filename,
|
|
|
|
below_4g_mem_size, above_4g_mem_size,
|
2013-05-30 09:57:26 +00:00
|
|
|
rom_memory, &ram_memory, guest_info);
|
2012-11-14 20:54:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* irq lines */
|
|
|
|
gsi_state = g_malloc0(sizeof(*gsi_state));
|
|
|
|
if (kvm_irqchip_in_kernel()) {
|
|
|
|
kvm_pc_setup_irq_routing(pci_enabled);
|
|
|
|
gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
|
|
|
|
GSI_NUM_PINS);
|
|
|
|
} else {
|
|
|
|
gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* create pci host bus */
|
|
|
|
q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
|
|
|
|
|
2013-07-29 14:47:54 +00:00
|
|
|
object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL);
|
2012-11-14 20:54:06 +00:00
|
|
|
q35_host->mch.ram_memory = ram_memory;
|
|
|
|
q35_host->mch.pci_address_space = pci_memory;
|
|
|
|
q35_host->mch.system_memory = get_system_memory();
|
2013-05-09 07:53:50 +00:00
|
|
|
q35_host->mch.address_space_io = get_system_io();
|
2012-11-14 20:54:06 +00:00
|
|
|
q35_host->mch.below_4g_mem_size = below_4g_mem_size;
|
|
|
|
q35_host->mch.above_4g_mem_size = above_4g_mem_size;
|
2013-05-30 09:57:26 +00:00
|
|
|
q35_host->mch.guest_info = guest_info;
|
2012-11-14 20:54:06 +00:00
|
|
|
/* pci */
|
|
|
|
qdev_init_nofail(DEVICE(q35_host));
|
2013-07-01 10:18:22 +00:00
|
|
|
phb = PCI_HOST_BRIDGE(q35_host);
|
|
|
|
host_bus = phb->bus;
|
2012-11-14 20:54:06 +00:00
|
|
|
/* create ISA bus */
|
|
|
|
lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
|
|
|
|
ICH9_LPC_FUNC), true,
|
|
|
|
TYPE_ICH9_LPC_DEVICE);
|
|
|
|
ich9_lpc = ICH9_LPC_DEVICE(lpc);
|
|
|
|
ich9_lpc->pic = gsi;
|
|
|
|
ich9_lpc->ioapic = gsi_state->ioapic_irq;
|
|
|
|
pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
|
|
|
|
ICH9_LPC_NB_PIRQS);
|
2013-01-23 02:11:37 +00:00
|
|
|
pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
|
2012-11-14 20:54:06 +00:00
|
|
|
isa_bus = ich9_lpc->isa_bus;
|
|
|
|
|
|
|
|
/*end early*/
|
|
|
|
isa_bus_irqs(isa_bus, gsi);
|
|
|
|
|
|
|
|
if (kvm_irqchip_in_kernel()) {
|
|
|
|
i8259 = kvm_i8259_init(isa_bus);
|
|
|
|
} else if (xen_enabled()) {
|
|
|
|
i8259 = xen_interrupt_controller_init();
|
|
|
|
} else {
|
|
|
|
cpu_irq = pc_allocate_cpu_irq();
|
|
|
|
i8259 = i8259_init(isa_bus, cpu_irq[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ISA_NUM_IRQS; i++) {
|
|
|
|
gsi_state->i8259_irq[i] = i8259[i];
|
|
|
|
}
|
|
|
|
if (pci_enabled) {
|
|
|
|
ioapic_init_gsi(gsi_state, NULL);
|
|
|
|
}
|
2013-04-29 15:02:50 +00:00
|
|
|
qdev_init_nofail(icc_bridge);
|
2012-11-14 20:54:06 +00:00
|
|
|
|
|
|
|
pc_register_ferr_irq(gsi[13]);
|
|
|
|
|
|
|
|
/* init basic PC hardware */
|
|
|
|
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, false);
|
|
|
|
|
|
|
|
/* connect pm stuff to lpc */
|
2013-04-24 10:37:22 +00:00
|
|
|
ich9_lpc_pm_init(lpc);
|
2012-11-14 20:54:06 +00:00
|
|
|
|
|
|
|
/* ahci and SATA device, for q35 1 ahci controller is built-in */
|
|
|
|
ahci = pci_create_simple_multifunction(host_bus,
|
|
|
|
PCI_DEVFN(ICH9_SATA1_DEV,
|
|
|
|
ICH9_SATA1_FUNC),
|
|
|
|
true, "ich9-ahci");
|
|
|
|
idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
|
|
|
|
idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
|
|
|
|
|
|
|
|
if (usb_enabled(false)) {
|
|
|
|
/* Should we create 6 UHCI according to ich9 spec? */
|
|
|
|
ehci_create_ich9_with_companions(host_bus, 0x1d);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: Populate SPD eeprom data. */
|
|
|
|
smbus_eeprom_init(ich9_smb_init(host_bus,
|
|
|
|
PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC),
|
|
|
|
0xb100),
|
|
|
|
8, NULL, 0);
|
|
|
|
|
hw: Clean up bogus default boot order
We set default boot order "cad" in every single machine definition
except "pseries" and "moxiesim", even though very few boards actually
care for boot order, and "cad" makes sense for even fewer.
Machines that care:
* pc and its variants
Accept up to three letters 'a', 'b' (undocumented alias for 'a'),
'c', 'd' and 'n'. Reject all others (fatal with -boot).
* nseries (n800, n810)
Check whether order starts with 'n'. Silently ignored otherwise.
* prep, g3beige, mac99
Extract the first character the machine understands (subset of
'a'..'f'). Silently ignored otherwise.
* spapr
Accept an arbitrary string (vl.c restricts it to contain only
'a'..'p', no duplicates).
* sun4[mdc]
Use the first character. Silently ignored otherwise.
Strip characters these machines ignore from their default boot order.
For all other machines, remove the unused default boot order
alltogether.
Note that my rename of QEMUMachine member boot_order to
default_boot_order and QEMUMachineInitArgs member boot_device to
boot_order has a welcome side effect: it makes every use of boot
orders visible in this patch, for easy review.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-08-16 11:13:50 +00:00
|
|
|
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_order,
|
2012-11-14 20:54:06 +00:00
|
|
|
floppy, idebus[0], idebus[1], rtc_state);
|
|
|
|
|
|
|
|
/* the rest devices to which pci devfn is automatically assigned */
|
|
|
|
pc_vga_init(isa_bus, host_bus);
|
|
|
|
pc_nic_init(isa_bus, host_bus);
|
|
|
|
if (pci_enabled) {
|
|
|
|
pc_pci_device_init(host_bus);
|
|
|
|
}
|
2013-04-26 03:24:46 +00:00
|
|
|
|
|
|
|
if (has_pvpanic) {
|
|
|
|
pvpanic_init(isa_bus);
|
|
|
|
}
|
2012-11-14 20:54:06 +00:00
|
|
|
}
|
|
|
|
|
2013-08-21 18:14:43 +00:00
|
|
|
static void pc_compat_1_6(QEMUMachineInitArgs *args)
|
2013-05-13 17:00:23 +00:00
|
|
|
{
|
|
|
|
has_pci_info = false;
|
2013-08-19 14:26:55 +00:00
|
|
|
rom_file_in_ram = false;
|
2013-05-13 17:00:23 +00:00
|
|
|
}
|
|
|
|
|
2013-08-21 18:14:43 +00:00
|
|
|
static void pc_compat_1_5(QEMUMachineInitArgs *args)
|
2013-08-01 12:39:11 +00:00
|
|
|
{
|
2013-08-21 18:14:43 +00:00
|
|
|
pc_compat_1_6(args);
|
2013-08-13 14:02:52 +00:00
|
|
|
has_pvpanic = true;
|
2013-08-01 12:39:11 +00:00
|
|
|
}
|
|
|
|
|
2013-08-21 18:14:43 +00:00
|
|
|
static void pc_compat_1_4(QEMUMachineInitArgs *args)
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
{
|
2013-08-21 18:14:44 +00:00
|
|
|
pc_compat_1_5(args);
|
|
|
|
has_pvpanic = false;
|
2013-04-25 18:43:04 +00:00
|
|
|
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
|
2013-08-09 14:11:36 +00:00
|
|
|
x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
|
2013-08-21 18:14:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
pc_compat_1_6(args);
|
|
|
|
pc_q35_init(args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pc_q35_init_1_5(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
pc_compat_1_5(args);
|
|
|
|
pc_q35_init(args);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
pc_compat_1_4(args);
|
|
|
|
pc_q35_init(args);
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
}
|
|
|
|
|
2013-05-27 20:23:53 +00:00
|
|
|
static QEMUMachine pc_q35_machine_v1_6 = {
|
|
|
|
.name = "pc-q35-1.6",
|
|
|
|
.alias = "q35",
|
|
|
|
.desc = "Standard PC (Q35 + ICH9, 2009)",
|
2013-08-01 12:39:11 +00:00
|
|
|
.init = pc_q35_init_1_6,
|
2013-05-27 20:23:53 +00:00
|
|
|
.hot_add_cpu = pc_hot_add_cpu,
|
|
|
|
.max_cpus = 255,
|
hw: Clean up bogus default boot order
We set default boot order "cad" in every single machine definition
except "pseries" and "moxiesim", even though very few boards actually
care for boot order, and "cad" makes sense for even fewer.
Machines that care:
* pc and its variants
Accept up to three letters 'a', 'b' (undocumented alias for 'a'),
'c', 'd' and 'n'. Reject all others (fatal with -boot).
* nseries (n800, n810)
Check whether order starts with 'n'. Silently ignored otherwise.
* prep, g3beige, mac99
Extract the first character the machine understands (subset of
'a'..'f'). Silently ignored otherwise.
* spapr
Accept an arbitrary string (vl.c restricts it to contain only
'a'..'p', no duplicates).
* sun4[mdc]
Use the first character. Silently ignored otherwise.
Strip characters these machines ignore from their default boot order.
For all other machines, remove the unused default boot order
alltogether.
Note that my rename of QEMUMachine member boot_order to
default_boot_order and QEMUMachineInitArgs member boot_device to
boot_order has a welcome side effect: it makes every use of boot
orders visible in this patch, for easy review.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-08-16 11:13:50 +00:00
|
|
|
.default_boot_order = "cad",
|
2013-05-27 20:23:53 +00:00
|
|
|
};
|
|
|
|
|
2013-02-08 13:06:15 +00:00
|
|
|
static QEMUMachine pc_q35_machine_v1_5 = {
|
|
|
|
.name = "pc-q35-1.5",
|
2013-01-08 07:53:13 +00:00
|
|
|
.desc = "Standard PC (Q35 + ICH9, 2009)",
|
2013-05-13 17:00:23 +00:00
|
|
|
.init = pc_q35_init_1_5,
|
2013-04-30 16:00:53 +00:00
|
|
|
.hot_add_cpu = pc_hot_add_cpu,
|
2012-11-14 20:54:06 +00:00
|
|
|
.max_cpus = 255,
|
hw: Clean up bogus default boot order
We set default boot order "cad" in every single machine definition
except "pseries" and "moxiesim", even though very few boards actually
care for boot order, and "cad" makes sense for even fewer.
Machines that care:
* pc and its variants
Accept up to three letters 'a', 'b' (undocumented alias for 'a'),
'c', 'd' and 'n'. Reject all others (fatal with -boot).
* nseries (n800, n810)
Check whether order starts with 'n'. Silently ignored otherwise.
* prep, g3beige, mac99
Extract the first character the machine understands (subset of
'a'..'f'). Silently ignored otherwise.
* spapr
Accept an arbitrary string (vl.c restricts it to contain only
'a'..'p', no duplicates).
* sun4[mdc]
Use the first character. Silently ignored otherwise.
Strip characters these machines ignore from their default boot order.
For all other machines, remove the unused default boot order
alltogether.
Note that my rename of QEMUMachine member boot_order to
default_boot_order and QEMUMachineInitArgs member boot_device to
boot_order has a welcome side effect: it makes every use of boot
orders visible in this patch, for easy review.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-08-16 11:13:50 +00:00
|
|
|
.default_boot_order = "cad",
|
2013-05-27 20:23:54 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_5,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-11-14 20:54:06 +00:00
|
|
|
};
|
|
|
|
|
2013-02-08 13:06:15 +00:00
|
|
|
static QEMUMachine pc_q35_machine_v1_4 = {
|
|
|
|
.name = "pc-q35-1.4",
|
|
|
|
.desc = "Standard PC (Q35 + ICH9, 2009)",
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
.init = pc_q35_init_1_4,
|
2013-02-08 13:06:15 +00:00
|
|
|
.max_cpus = 255,
|
hw: Clean up bogus default boot order
We set default boot order "cad" in every single machine definition
except "pseries" and "moxiesim", even though very few boards actually
care for boot order, and "cad" makes sense for even fewer.
Machines that care:
* pc and its variants
Accept up to three letters 'a', 'b' (undocumented alias for 'a'),
'c', 'd' and 'n'. Reject all others (fatal with -boot).
* nseries (n800, n810)
Check whether order starts with 'n'. Silently ignored otherwise.
* prep, g3beige, mac99
Extract the first character the machine understands (subset of
'a'..'f'). Silently ignored otherwise.
* spapr
Accept an arbitrary string (vl.c restricts it to contain only
'a'..'p', no duplicates).
* sun4[mdc]
Use the first character. Silently ignored otherwise.
Strip characters these machines ignore from their default boot order.
For all other machines, remove the unused default boot order
alltogether.
Note that my rename of QEMUMachine member boot_order to
default_boot_order and QEMUMachineInitArgs member boot_device to
boot_order has a welcome side effect: it makes every use of boot
orders visible in this patch, for easy review.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-08-16 11:13:50 +00:00
|
|
|
.default_boot_order = "cad",
|
2013-02-08 13:06:15 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_4,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2012-11-14 20:54:06 +00:00
|
|
|
static void pc_q35_machine_init(void)
|
|
|
|
{
|
2013-05-27 20:23:53 +00:00
|
|
|
qemu_register_machine(&pc_q35_machine_v1_6);
|
2013-02-08 13:06:15 +00:00
|
|
|
qemu_register_machine(&pc_q35_machine_v1_5);
|
|
|
|
qemu_register_machine(&pc_q35_machine_v1_4);
|
2012-11-14 20:54:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
machine_init(pc_q35_machine_init);
|