2012-11-14 21:54:06 +01: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.
|
|
|
|
*/
|
2016-01-26 19:17:03 +01:00
|
|
|
#include "qemu/osdep.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/hw.h"
|
2013-08-19 16:26:55 +02:00
|
|
|
#include "hw/loader.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/arch_init.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i2c/smbus.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/timer/mc146818rtc.h"
|
|
|
|
#include "hw/xen/xen.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/kvm.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/kvm/clock.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/pci-host/q35.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2016-03-07 20:22:05 +01:00
|
|
|
#include "hw/i386/pc.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i386/ich9.h"
|
2015-08-12 04:08:20 +02:00
|
|
|
#include "hw/smbios/smbios.h"
|
2012-11-14 21:54:06 +01:00
|
|
|
#include "hw/ide/pci.h"
|
|
|
|
#include "hw/ide/ahci.h"
|
|
|
|
#include "hw/usb.h"
|
2014-06-20 03:40:25 +02:00
|
|
|
#include "qemu/error-report.h"
|
2015-05-19 13:29:51 +02:00
|
|
|
#include "migration/migration.h"
|
2012-11-14 21:54:06 +01:00
|
|
|
|
|
|
|
/* ICH9 AHCI has 6 ports */
|
|
|
|
#define MAX_SATA_PORTS 6
|
|
|
|
|
|
|
|
/* PC hardware initialisation */
|
2014-05-07 16:42:57 +02:00
|
|
|
static void pc_q35_init(MachineState *machine)
|
2012-11-14 21:54:06 +01:00
|
|
|
{
|
2015-08-07 21:55:45 +02:00
|
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
2015-12-01 23:58:03 +01:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2012-11-14 21:54:06 +01:00
|
|
|
Q35PCIHost *q35_host;
|
2013-07-01 12:18:22 +02:00
|
|
|
PCIHostState *phb;
|
2012-11-14 21:54:06 +01:00
|
|
|
PCIBus *host_bus;
|
|
|
|
PCIDevice *lpc;
|
2016-06-22 14:24:54 +02:00
|
|
|
DeviceState *lpc_dev;
|
2012-11-14 21:54:06 +01:00
|
|
|
BusState *idebus[MAX_SATA_PORTS];
|
|
|
|
ISADevice *rtc_state;
|
2016-03-04 17:00:32 +01:00
|
|
|
MemoryRegion *system_io = get_system_io();
|
2012-11-14 21:54:06 +01:00
|
|
|
MemoryRegion *pci_memory;
|
|
|
|
MemoryRegion *rom_memory;
|
|
|
|
MemoryRegion *ram_memory;
|
|
|
|
GSIState *gsi_state;
|
|
|
|
ISABus *isa_bus;
|
|
|
|
qemu_irq *i8259;
|
|
|
|
int i;
|
|
|
|
ICH9LPCState *ich9_lpc;
|
|
|
|
PCIDevice *ahci;
|
2014-06-20 03:40:25 +02:00
|
|
|
ram_addr_t lowmem;
|
2014-10-01 20:19:29 +02:00
|
|
|
DriveInfo *hd[MAX_SATA_PORTS];
|
2015-05-28 22:04:10 +02:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2013-04-29 17:02:50 +02:00
|
|
|
|
2013-12-16 12:55:06 +01:00
|
|
|
/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory
|
|
|
|
* and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
|
|
|
|
* also known as MMCFG).
|
|
|
|
* If it doesn't, we need to split it in chunks below and above 4G.
|
|
|
|
* In any case, try to make sure that guest addresses aligned at
|
|
|
|
* 1G boundaries get mapped to host addresses aligned at 1G boundaries.
|
|
|
|
*/
|
2014-05-07 16:42:57 +02:00
|
|
|
if (machine->ram_size >= 0xb0000000) {
|
2016-01-23 17:02:13 +01:00
|
|
|
lowmem = 0x80000000;
|
2014-06-20 03:40:25 +02:00
|
|
|
} else {
|
|
|
|
lowmem = 0xb0000000;
|
|
|
|
}
|
|
|
|
|
2014-07-07 21:00:41 +02:00
|
|
|
/* Handle the machine opt max-ram-below-4g. It is basically doing
|
2014-06-20 03:40:25 +02:00
|
|
|
* min(qemu limit, user limit).
|
|
|
|
*/
|
2016-06-24 13:35:17 +02:00
|
|
|
if (!pcms->max_ram_below_4g) {
|
|
|
|
pcms->max_ram_below_4g = 1ULL << 32; /* default: 4G */;
|
|
|
|
}
|
2015-08-07 21:55:45 +02:00
|
|
|
if (lowmem > pcms->max_ram_below_4g) {
|
|
|
|
lowmem = pcms->max_ram_below_4g;
|
2014-06-20 03:40:25 +02:00
|
|
|
if (machine->ram_size - lowmem > lowmem &&
|
|
|
|
lowmem & ((1ULL << 30) - 1)) {
|
|
|
|
error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64
|
|
|
|
") not a multiple of 1G; possible bad performance.",
|
2015-08-07 21:55:45 +02:00
|
|
|
pcms->max_ram_below_4g);
|
2014-06-20 03:40:25 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (machine->ram_size >= lowmem) {
|
2015-08-07 21:55:51 +02:00
|
|
|
pcms->above_4g_mem_size = machine->ram_size - lowmem;
|
|
|
|
pcms->below_4g_mem_size = lowmem;
|
2012-11-14 21:54:06 +01:00
|
|
|
} else {
|
2015-08-07 21:55:51 +02:00
|
|
|
pcms->above_4g_mem_size = 0;
|
|
|
|
pcms->below_4g_mem_size = machine->ram_size;
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
2016-01-14 16:09:38 +01:00
|
|
|
if (xen_enabled()) {
|
|
|
|
xen_hvm_init(pcms, &ram_memory);
|
2014-06-20 03:40:24 +02:00
|
|
|
}
|
|
|
|
|
2015-10-15 05:12:12 +02:00
|
|
|
pc_cpus_init(pcms);
|
2014-06-20 03:40:24 +02:00
|
|
|
|
|
|
|
kvmclock_create();
|
|
|
|
|
2012-11-14 21:54:06 +01:00
|
|
|
/* pci enabled */
|
2015-12-01 23:58:03 +01:00
|
|
|
if (pcmc->pci_enabled) {
|
2012-11-14 21:54:06 +01:00
|
|
|
pci_memory = g_new(MemoryRegion, 1);
|
2013-11-06 19:18:08 +01:00
|
|
|
memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
|
2012-11-14 21:54:06 +01:00
|
|
|
rom_memory = pci_memory;
|
|
|
|
} else {
|
|
|
|
pci_memory = NULL;
|
|
|
|
rom_memory = get_system_memory();
|
|
|
|
}
|
|
|
|
|
2015-12-11 19:42:30 +01:00
|
|
|
pc_guest_info_init(pcms);
|
pc: hack for migration compatibility from QEMU 2.0
Changing the ACPI table size causes migration to break, and the memory
hotplug work opened our eyes on how horribly we were breaking things in
2.0 already.
The ACPI table size is rounded to the next 4k, which one would think
gives some headroom. In practice this is not the case, because the user
can control the ACPI table size (each CPU adds 97 bytes to the SSDT and
8 to the MADT) and so some "-smp" values will break the 4k boundary and
fail to migrate. Similarly, PCI bridges add ~1870 bytes to the SSDT.
This patch concerns itself with fixing migration from QEMU 2.0. It
computes the payload size of QEMU 2.0 and always uses that one.
The previous patch shrunk the ACPI tables enough that the QEMU 2.0 size
should always be enough; non-AML tables can change depending on the
configuration (especially MADT, SRAT, HPET) but they remain the same
between QEMU 2.0 and 2.1, so we only compute our padding based on the
sizes of the SSDT and DSDT.
Migration from QEMU 1.7 should work for guests that have a number of CPUs
other than 12, 13, 14, 54, 55, 56, 97, 98, 139, 140. It was already
broken from QEMU 1.7 to QEMU 2.0 in the same way, though.
Even with this patch, QEMU 1.7 and 2.0 have two different ideas of
"-M pc-i440fx-2.0" when there are PCI bridges. Igor sent a patch to
adopt the QEMU 1.7 definition. I think distributions should apply
it if they move directly from QEMU 1.7 to 2.1+ without ever packaging
version 2.0.
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2014-07-28 17:34:15 +02:00
|
|
|
|
2015-12-01 23:58:03 +01:00
|
|
|
if (pcmc->smbios_defaults) {
|
2013-10-30 13:56:40 +01:00
|
|
|
/* These values are guest ABI, do not change */
|
2014-04-23 15:42:38 +02:00
|
|
|
smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
|
2015-12-01 23:58:03 +01:00
|
|
|
mc->name, pcmc->smbios_legacy_mode,
|
|
|
|
pcmc->smbios_uuid_encoded,
|
2015-09-07 11:39:28 +02:00
|
|
|
SMBIOS_ENTRY_POINT_21);
|
2013-10-30 13:56:40 +01:00
|
|
|
}
|
|
|
|
|
2012-11-14 21:54:06 +01:00
|
|
|
/* allocate ram and load rom/bios */
|
|
|
|
if (!xen_enabled()) {
|
2015-08-07 21:55:50 +02:00
|
|
|
pc_memory_init(pcms, get_system_memory(),
|
2015-12-11 19:42:24 +01:00
|
|
|
rom_memory, &ram_memory);
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* irq lines */
|
|
|
|
gsi_state = g_malloc0(sizeof(*gsi_state));
|
2016-03-07 20:22:05 +01:00
|
|
|
if (kvm_ioapic_in_kernel()) {
|
2015-12-01 23:58:03 +01:00
|
|
|
kvm_pc_setup_irq_routing(pcmc->pci_enabled);
|
2016-07-14 18:03:29 +02:00
|
|
|
pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
|
|
|
|
GSI_NUM_PINS);
|
2012-11-14 21:54:06 +01:00
|
|
|
} else {
|
2016-07-14 18:03:29 +02:00
|
|
|
pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* create pci host bus */
|
|
|
|
q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
|
|
|
|
|
2013-07-29 16:47:54 +02:00
|
|
|
object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL);
|
2016-06-22 14:24:50 +02:00
|
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory),
|
|
|
|
MCH_HOST_PROP_RAM_MEM, NULL);
|
|
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory),
|
|
|
|
MCH_HOST_PROP_PCI_MEM, NULL);
|
|
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()),
|
|
|
|
MCH_HOST_PROP_SYSTEM_MEM, NULL);
|
|
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(system_io),
|
|
|
|
MCH_HOST_PROP_IO_MEM, NULL);
|
|
|
|
object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size,
|
|
|
|
PCI_HOST_BELOW_4G_MEM_SIZE, NULL);
|
|
|
|
object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size,
|
|
|
|
PCI_HOST_ABOVE_4G_MEM_SIZE, NULL);
|
2012-11-14 21:54:06 +01:00
|
|
|
/* pci */
|
|
|
|
qdev_init_nofail(DEVICE(q35_host));
|
2013-07-01 12:18:22 +02:00
|
|
|
phb = PCI_HOST_BRIDGE(q35_host);
|
|
|
|
host_bus = phb->bus;
|
2012-11-14 21:54:06 +01:00
|
|
|
/* create ISA bus */
|
|
|
|
lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
|
|
|
|
ICH9_LPC_FUNC), true,
|
|
|
|
TYPE_ICH9_LPC_DEVICE);
|
2014-06-02 15:25:24 +02:00
|
|
|
|
|
|
|
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
|
|
|
|
TYPE_HOTPLUG_HANDLER,
|
2015-08-07 21:55:45 +02:00
|
|
|
(Object **)&pcms->acpi_dev,
|
2014-06-02 15:25:24 +02:00
|
|
|
object_property_allow_set_link,
|
|
|
|
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
|
|
|
|
object_property_set_link(OBJECT(machine), OBJECT(lpc),
|
|
|
|
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
|
|
|
|
2012-11-14 21:54:06 +01:00
|
|
|
ich9_lpc = ICH9_LPC_DEVICE(lpc);
|
2016-06-22 14:24:54 +02:00
|
|
|
lpc_dev = DEVICE(lpc);
|
|
|
|
for (i = 0; i < GSI_NUM_PINS; i++) {
|
2016-07-14 18:03:29 +02:00
|
|
|
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, pcms->gsi[i]);
|
2016-06-22 14:24:54 +02:00
|
|
|
}
|
2012-11-14 21:54:06 +01:00
|
|
|
pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
|
|
|
|
ICH9_LPC_NB_PIRQS);
|
2013-01-23 03:11:37 +01:00
|
|
|
pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
|
2012-11-14 21:54:06 +01:00
|
|
|
isa_bus = ich9_lpc->isa_bus;
|
|
|
|
|
2016-03-07 20:22:05 +01:00
|
|
|
if (kvm_pic_in_kernel()) {
|
2012-11-14 21:54:06 +01:00
|
|
|
i8259 = kvm_i8259_init(isa_bus);
|
|
|
|
} else if (xen_enabled()) {
|
|
|
|
i8259 = xen_interrupt_controller_init();
|
|
|
|
} else {
|
2015-05-29 07:26:59 +02:00
|
|
|
i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ISA_NUM_IRQS; i++) {
|
|
|
|
gsi_state->i8259_irq[i] = i8259[i];
|
|
|
|
}
|
2016-07-14 14:27:17 +02:00
|
|
|
g_free(i8259);
|
|
|
|
|
2015-12-01 23:58:03 +01:00
|
|
|
if (pcmc->pci_enabled) {
|
2014-08-04 23:11:19 +02:00
|
|
|
ioapic_init_gsi(gsi_state, "q35");
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
2016-07-14 18:03:29 +02:00
|
|
|
pc_register_ferr_irq(pcms->gsi[13]);
|
2012-11-14 21:54:06 +01:00
|
|
|
|
qapi: Don't let implicit enum MAX member collide
Now that we guarantee the user doesn't have any enum values
beginning with a single underscore, we can use that for our
own purposes. Renaming ENUM_MAX to ENUM__MAX makes it obvious
that the sentinel is generated.
This patch was mostly generated by applying a temporary patch:
|diff --git a/scripts/qapi.py b/scripts/qapi.py
|index e6d014b..b862ec9 100644
|--- a/scripts/qapi.py
|+++ b/scripts/qapi.py
|@@ -1570,6 +1570,7 @@ const char *const %(c_name)s_lookup[] = {
| max_index = c_enum_const(name, 'MAX', prefix)
| ret += mcgen('''
| [%(max_index)s] = NULL,
|+// %(max_index)s
| };
| ''',
| max_index=max_index)
then running:
$ cat qapi-{types,event}.c tests/test-qapi-types.c |
sed -n 's,^// \(.*\)MAX,s|\1MAX|\1_MAX|g,p' > list
$ git grep -l _MAX | xargs sed -i -f list
The only things not generated are the changes in scripts/qapi.py.
Rejecting enum members named 'MAX' is now useless, and will be dropped
in the next patch.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-23-git-send-email-eblake@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
[Rebased to current master, commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-11-18 09:52:57 +01:00
|
|
|
assert(pcms->vmport != ON_OFF_AUTO__MAX);
|
2015-08-07 21:55:45 +02:00
|
|
|
if (pcms->vmport == ON_OFF_AUTO_AUTO) {
|
|
|
|
pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
|
2014-11-21 17:18:52 +01:00
|
|
|
}
|
|
|
|
|
2012-11-14 21:54:06 +01:00
|
|
|
/* init basic PC hardware */
|
2016-07-14 18:03:29 +02:00
|
|
|
pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy,
|
2016-11-05 08:19:50 +01:00
|
|
|
(pcms->vmport != ON_OFF_AUTO_ON), pcms->pit,
|
|
|
|
0xff0104);
|
2012-11-14 21:54:06 +01:00
|
|
|
|
|
|
|
/* connect pm stuff to lpc */
|
2016-01-23 17:02:11 +01:00
|
|
|
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));
|
2012-11-14 21:54:06 +01:00
|
|
|
|
2016-11-05 08:19:49 +01:00
|
|
|
if (pcms->sata) {
|
|
|
|
/* 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");
|
|
|
|
g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
|
|
|
|
ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
|
|
|
|
ahci_ide_create_devs(ahci, hd);
|
|
|
|
} else {
|
|
|
|
idebus[0] = idebus[1] = NULL;
|
|
|
|
}
|
2012-11-14 21:54:06 +01:00
|
|
|
|
2016-06-08 22:50:25 +02:00
|
|
|
if (machine_usb(machine)) {
|
2012-11-14 21:54:06 +01:00
|
|
|
/* Should we create 6 UHCI according to ich9 spec? */
|
|
|
|
ehci_create_ich9_with_companions(host_bus, 0x1d);
|
|
|
|
}
|
|
|
|
|
2016-11-05 08:19:48 +01:00
|
|
|
if (pcms->smbus) {
|
|
|
|
/* 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);
|
|
|
|
}
|
2012-11-14 21:54:06 +01:00
|
|
|
|
2015-08-07 21:55:54 +02:00
|
|
|
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
|
2012-11-14 21:54:06 +01:00
|
|
|
|
|
|
|
/* the rest devices to which pci devfn is automatically assigned */
|
|
|
|
pc_vga_init(isa_bus, host_bus);
|
|
|
|
pc_nic_init(isa_bus, host_bus);
|
2015-12-01 23:58:03 +01:00
|
|
|
if (pcmc->pci_enabled) {
|
2012-11-14 21:54:06 +01:00
|
|
|
pc_pci_device_init(host_bus);
|
|
|
|
}
|
2016-03-04 17:00:32 +01:00
|
|
|
|
|
|
|
if (pcms->acpi_nvdimm_state.is_enabled) {
|
|
|
|
nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
|
|
|
|
pcms->fw_cfg, OBJECT(pcms));
|
|
|
|
}
|
2012-11-14 21:54:06 +01:00
|
|
|
}
|
|
|
|
|
2015-05-15 19:19:01 +02:00
|
|
|
#define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
|
|
|
|
static void pc_init_##suffix(MachineState *machine) \
|
|
|
|
{ \
|
|
|
|
void (*compat)(MachineState *m) = (compatfn); \
|
|
|
|
if (compat) { \
|
|
|
|
compat(machine); \
|
|
|
|
} \
|
|
|
|
pc_q35_init(machine); \
|
|
|
|
} \
|
|
|
|
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
|
2014-04-24 12:14:53 +02:00
|
|
|
|
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 17:25:03 +02:00
|
|
|
|
2015-05-15 19:18:56 +02:00
|
|
|
static void pc_q35_machine_options(MachineClass *m)
|
2015-05-15 19:18:54 +02:00
|
|
|
{
|
|
|
|
m->family = "pc_q35";
|
|
|
|
m->desc = "Standard PC (Q35 + ICH9, 2009)";
|
|
|
|
m->hot_add_cpu = pc_hot_add_cpu;
|
|
|
|
m->units_per_default_bus = 1;
|
2015-09-11 22:14:23 +02:00
|
|
|
m->default_machine_opts = "firmware=bios-256k.bin";
|
|
|
|
m->default_display = "std";
|
|
|
|
m->no_floppy = 1;
|
2016-06-27 17:38:33 +02:00
|
|
|
m->has_dynamic_sysbus = true;
|
2016-10-19 14:05:43 +02:00
|
|
|
m->max_cpus = 288;
|
2015-05-15 19:18:54 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 19:24:16 +01:00
|
|
|
static void pc_q35_2_9_machine_options(MachineClass *m)
|
2015-09-11 22:14:25 +02:00
|
|
|
{
|
|
|
|
pc_q35_machine_options(m);
|
|
|
|
m->alias = "q35";
|
|
|
|
}
|
|
|
|
|
2017-01-12 19:24:16 +01:00
|
|
|
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
|
|
|
|
pc_q35_2_9_machine_options);
|
|
|
|
|
|
|
|
static void pc_q35_2_8_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_q35_2_9_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
|
|
|
|
}
|
|
|
|
|
2016-09-07 07:21:12 +02:00
|
|
|
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
|
|
|
|
pc_q35_2_8_machine_options);
|
|
|
|
|
|
|
|
static void pc_q35_2_7_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_q35_2_8_machine_options(m);
|
2016-10-19 14:05:43 +02:00
|
|
|
m->max_cpus = 255;
|
2016-09-07 07:21:12 +02:00
|
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
|
|
|
|
}
|
|
|
|
|
2016-05-17 16:43:10 +02:00
|
|
|
DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
|
|
|
|
pc_q35_2_7_machine_options);
|
|
|
|
|
|
|
|
static void pc_q35_2_6_machine_options(MachineClass *m)
|
|
|
|
{
|
2016-06-15 11:25:23 +02:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2016-05-17 16:43:10 +02:00
|
|
|
pc_q35_2_7_machine_options(m);
|
2016-06-15 11:25:23 +02:00
|
|
|
pcmc->legacy_cpu_hotplug = true;
|
2016-05-17 16:43:10 +02:00
|
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);
|
|
|
|
}
|
|
|
|
|
2015-11-30 15:56:36 +01:00
|
|
|
DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
|
|
|
|
pc_q35_2_6_machine_options);
|
|
|
|
|
|
|
|
static void pc_q35_2_5_machine_options(MachineClass *m)
|
|
|
|
{
|
2015-11-24 04:33:57 +01:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2015-11-30 15:56:36 +01:00
|
|
|
pc_q35_2_6_machine_options(m);
|
2015-11-24 04:33:57 +01:00
|
|
|
pcmc->save_tsc_khz = false;
|
2016-04-07 16:12:58 +02:00
|
|
|
m->legacy_fw_cfg_order = 1;
|
2015-11-30 15:56:36 +01:00
|
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
|
|
|
|
}
|
|
|
|
|
2015-09-11 22:14:25 +02:00
|
|
|
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
|
|
|
|
pc_q35_2_5_machine_options);
|
|
|
|
|
2015-05-15 19:18:56 +02:00
|
|
|
static void pc_q35_2_4_machine_options(MachineClass *m)
|
2015-05-15 19:18:54 +02:00
|
|
|
{
|
2015-09-07 13:55:32 +02:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2015-09-11 22:14:25 +02:00
|
|
|
pc_q35_2_5_machine_options(m);
|
2015-10-30 20:36:07 +01:00
|
|
|
m->hw_version = "2.4.0";
|
2015-09-07 13:55:32 +02:00
|
|
|
pcmc->broken_reserved_end = true;
|
2015-09-11 22:14:25 +02:00
|
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
|
2015-05-15 19:18:54 +02:00
|
|
|
}
|
2013-12-02 12:47:29 +01:00
|
|
|
|
2015-05-15 19:19:01 +02:00
|
|
|
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
|
|
|
|
pc_q35_2_4_machine_options);
|