2010-05-14 11:29:15 +04:00
|
|
|
/*
|
|
|
|
* QEMU PC System Emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* 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 21:17:03 +03:00
|
|
|
#include "qemu/osdep.h"
|
2020-02-03 13:42:03 +03:00
|
|
|
#include CONFIG_DEVICES
|
2011-08-15 18:17:38 +04:00
|
|
|
|
2018-06-29 17:22:13 +03:00
|
|
|
#include "qemu/units.h"
|
2013-08-19 18:26:55 +04:00
|
|
|
#include "hw/loader.h"
|
2019-10-08 12:56:49 +03:00
|
|
|
#include "hw/i386/x86.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/i386/pc.h"
|
|
|
|
#include "hw/i386/apic.h"
|
2019-02-02 22:57:47 +03:00
|
|
|
#include "hw/pci-host/i440fx.h"
|
2018-01-06 18:37:26 +03:00
|
|
|
#include "hw/southbridge/piix.h"
|
2018-06-13 15:29:46 +03:00
|
|
|
#include "hw/display/ramfb.h"
|
2018-12-11 19:34:06 +03:00
|
|
|
#include "hw/firmware/smbios.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/pci/pci.h"
|
|
|
|
#include "hw/pci/pci_ids.h"
|
|
|
|
#include "hw/usb.h"
|
2012-10-24 10:43:34 +04:00
|
|
|
#include "net/net.h"
|
2020-03-17 18:05:37 +03:00
|
|
|
#include "hw/ide/pci.h"
|
2019-08-12 08:23:42 +03:00
|
|
|
#include "hw/irq.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/kvm.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/kvm/clock.h"
|
|
|
|
#include "hw/sysbus.h"
|
2018-11-14 03:31:27 +03:00
|
|
|
#include "hw/i2c/smbus_eeprom.h"
|
2020-09-08 18:55:29 +03:00
|
|
|
#include "hw/xen/xen-x86.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "exec/memory.h"
|
2013-04-15 10:19:22 +04:00
|
|
|
#include "hw/acpi/acpi.h"
|
2018-02-01 14:18:31 +03:00
|
|
|
#include "qapi/error.h"
|
2014-06-20 05:40:25 +04:00
|
|
|
#include "qemu/error-report.h"
|
2020-05-08 13:02:22 +03:00
|
|
|
#include "sysemu/xen.h"
|
2010-06-30 15:58:34 +04:00
|
|
|
#ifdef CONFIG_XEN
|
2015-07-15 08:37:49 +03:00
|
|
|
#include <xen/hvm/hvm_info_table.h>
|
|
|
|
#include "hw/xen/xen_pt.h"
|
2010-06-30 15:58:34 +04:00
|
|
|
#endif
|
2017-04-24 19:53:30 +03:00
|
|
|
#include "migration/global_state.h"
|
2017-04-24 20:02:44 +03:00
|
|
|
#include "migration/misc.h"
|
2017-05-02 19:29:55 +03:00
|
|
|
#include "sysemu/numa.h"
|
2020-04-24 15:34:42 +03:00
|
|
|
#include "hw/hyperv/vmbus-bridge.h"
|
hw/i386: Include "hw/mem/nvdimm.h"
All this files use methods/definitions declared in the NVDIMM
device header. Include it.
This fixes (when modifying unrelated headers):
hw/i386/acpi-build.c:2733:9: error: implicit declaration of function 'nvdimm_build_acpi' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
^
hw/i386/pc.c:1996:61: error: use of undeclared identifier 'TYPE_NVDIMM'
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2032:55: error: use of undeclared identifier 'TYPE_NVDIMM'
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
^
hw/i386/pc.c:2040:9: error: implicit declaration of function 'nvdimm_plug' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2040:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes]
nvdimm_plug(ms->nvdimms_state);
^
hw/i386/pc.c:2065:42: error: use of undeclared identifier 'TYPE_NVDIMM'
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
^
hw/i386/pc_i440fx.c:307:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
hw/i386/pc_q35.c:332:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
^
Acked-by: John Snow <jsnow@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200228114649.12818-17-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
2020-02-28 14:46:47 +03:00
|
|
|
#include "hw/mem/nvdimm.h"
|
2020-04-21 15:59:29 +03:00
|
|
|
#include "hw/i386/acpi-build.h"
|
2021-03-22 16:27:40 +03:00
|
|
|
#include "kvm/kvm-cpu.h"
|
2010-05-14 11:29:15 +04:00
|
|
|
|
|
|
|
#define MAX_IDE_BUS 2
|
|
|
|
|
2019-07-05 17:35:54 +03:00
|
|
|
#ifdef CONFIG_IDE_ISA
|
2010-05-14 11:29:15 +04:00
|
|
|
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
|
|
|
|
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
|
|
|
|
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
|
2019-07-05 17:35:54 +03:00
|
|
|
#endif
|
2010-05-14 11:29:15 +04:00
|
|
|
|
|
|
|
/* PC hardware initialisation */
|
2015-07-15 08:37:42 +03:00
|
|
|
static void pc_init1(MachineState *machine,
|
|
|
|
const char *host_type, const char *pci_type)
|
2010-05-14 11:29:15 +04:00
|
|
|
{
|
2015-08-07 22:55:45 +03:00
|
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2019-10-22 10:39:50 +03:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(machine);
|
2013-08-21 22:14:45 +04:00
|
|
|
MemoryRegion *system_memory = get_system_memory();
|
|
|
|
MemoryRegion *system_io = get_system_io();
|
2010-05-14 11:29:15 +04:00
|
|
|
PCIBus *pci_bus;
|
2011-12-16 01:09:51 +04:00
|
|
|
ISABus *isa_bus;
|
2010-05-14 11:29:15 +04:00
|
|
|
PCII440FXState *i440fx_state;
|
|
|
|
int piix3_devfn = -1;
|
2015-05-26 04:46:05 +03:00
|
|
|
qemu_irq smi_irq;
|
2011-10-07 11:19:35 +04:00
|
|
|
GSIState *gsi_state;
|
2010-06-24 21:58:20 +04:00
|
|
|
BusState *idebus[MAX_IDE_BUS];
|
2010-05-14 11:29:17 +04:00
|
|
|
ISADevice *rtc_state;
|
2011-08-15 18:17:38 +04:00
|
|
|
MemoryRegion *ram_memory;
|
|
|
|
MemoryRegion *pci_memory;
|
2011-09-21 22:49:29 +04:00
|
|
|
MemoryRegion *rom_memory;
|
2014-06-20 05:40:25 +04:00
|
|
|
ram_addr_t lowmem;
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2016-06-02 11:48:25 +03:00
|
|
|
/*
|
|
|
|
* Calculate ram split, for memory below and above 4G. It's a bit
|
|
|
|
* complicated for backward compatibility reasons ...
|
|
|
|
*
|
|
|
|
* - Traditional split is 3.5G (lowmem = 0xe0000000). This is the
|
|
|
|
* default value for max_ram_below_4g now.
|
|
|
|
*
|
|
|
|
* - Then, to gigabyte align the memory, we move the split to 3G
|
|
|
|
* (lowmem = 0xc0000000). But only in case we have to split in
|
|
|
|
* the first place, i.e. ram_size is larger than (traditional)
|
|
|
|
* lowmem. And for new machine types (gigabyte_align = true)
|
|
|
|
* only, for live migration compatibility reasons.
|
|
|
|
*
|
|
|
|
* - Next the max-ram-below-4g option was added, which allowed to
|
|
|
|
* reduce lowmem to a smaller value, to allow a larger PCI I/O
|
|
|
|
* window below 4G. qemu doesn't enforce gigabyte alignment here,
|
|
|
|
* but prints a warning.
|
|
|
|
*
|
|
|
|
* - Finally max-ram-below-4g got updated to also allow raising lowmem,
|
|
|
|
* so legacy non-PAE guests can get as much memory as possible in
|
|
|
|
* the 32bit address space below 4G.
|
|
|
|
*
|
2020-09-08 18:55:26 +03:00
|
|
|
* - Note that Xen has its own ram setup code in xen_ram_init(),
|
|
|
|
* called via xen_hvm_init_pc().
|
2016-06-24 14:35:17 +03:00
|
|
|
*
|
2016-06-02 11:48:25 +03:00
|
|
|
* Examples:
|
|
|
|
* qemu -M pc-1.7 -m 4G (old default) -> 3584M low, 512M high
|
|
|
|
* qemu -M pc -m 4G (new default) -> 3072M low, 1024M high
|
|
|
|
* qemu -M pc,max-ram-below-4g=2G -m 4G -> 2048M low, 2048M high
|
|
|
|
* qemu -M pc,max-ram-below-4g=4G -m 3968M -> 3968M low (=4G-128M)
|
2013-12-16 15:54:19 +04:00
|
|
|
*/
|
2016-06-24 14:35:17 +03:00
|
|
|
if (xen_enabled()) {
|
2020-09-08 18:55:26 +03:00
|
|
|
xen_hvm_init_pc(pcms, &ram_memory);
|
2016-06-24 14:35:17 +03:00
|
|
|
} else {
|
2020-05-29 10:39:56 +03:00
|
|
|
if (!pcms->max_ram_below_4g) {
|
|
|
|
pcms->max_ram_below_4g = 0xe0000000; /* default: 3.5G */
|
2016-06-24 14:35:17 +03:00
|
|
|
}
|
2020-05-29 10:39:56 +03:00
|
|
|
lowmem = pcms->max_ram_below_4g;
|
|
|
|
if (machine->ram_size >= pcms->max_ram_below_4g) {
|
2016-06-24 14:35:17 +03:00
|
|
|
if (pcmc->gigabyte_align) {
|
|
|
|
if (lowmem > 0xc0000000) {
|
|
|
|
lowmem = 0xc0000000;
|
|
|
|
}
|
2018-06-29 17:22:13 +03:00
|
|
|
if (lowmem & (1 * GiB - 1)) {
|
2017-07-12 16:57:41 +03:00
|
|
|
warn_report("Large machine and max_ram_below_4g "
|
|
|
|
"(%" PRIu64 ") not a multiple of 1G; "
|
|
|
|
"possible bad performance.",
|
2020-05-29 10:39:56 +03:00
|
|
|
pcms->max_ram_below_4g);
|
2016-06-24 14:35:17 +03:00
|
|
|
}
|
2016-06-02 11:48:25 +03:00
|
|
|
}
|
2014-06-20 05:40:25 +04:00
|
|
|
}
|
|
|
|
|
2016-06-24 14:35:17 +03:00
|
|
|
if (machine->ram_size >= lowmem) {
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->above_4g_mem_size = machine->ram_size - lowmem;
|
|
|
|
x86ms->below_4g_mem_size = lowmem;
|
2016-06-24 14:35:17 +03:00
|
|
|
} else {
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->above_4g_mem_size = 0;
|
|
|
|
x86ms->below_4g_mem_size = machine->ram_size;
|
2016-06-24 14:35:17 +03:00
|
|
|
}
|
2014-06-20 05:40:24 +04:00
|
|
|
}
|
|
|
|
|
2019-09-30 18:26:29 +03:00
|
|
|
x86_cpus_init(x86ms, pcmc->default_cpu_version);
|
2014-06-20 05:40:24 +04:00
|
|
|
|
2020-09-22 18:19:34 +03:00
|
|
|
if (pcmc->kvmclock_enabled) {
|
|
|
|
kvmclock_create(pcmc->kvmclock_create_always);
|
2014-06-20 05:40:24 +04:00
|
|
|
}
|
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
if (pcmc->pci_enabled) {
|
2011-09-21 22:49:29 +04:00
|
|
|
pci_memory = g_new(MemoryRegion, 1);
|
2013-11-06 22:18:08 +04:00
|
|
|
memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
|
2011-09-21 22:49:29 +04:00
|
|
|
rom_memory = pci_memory;
|
|
|
|
} else {
|
|
|
|
pci_memory = NULL;
|
|
|
|
rom_memory = system_memory;
|
|
|
|
}
|
2011-08-15 18:17:38 +04:00
|
|
|
|
2015-12-11 21:42:30 +03:00
|
|
|
pc_guest_info_init(pcms);
|
2013-05-30 13:57:26 +04:00
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
if (pcmc->smbios_defaults) {
|
2014-05-07 18:42:57 +04:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2013-10-30 16:56:40 +04:00
|
|
|
/* These values are guest ABI, do not change */
|
2014-04-23 17:42:38 +04:00
|
|
|
smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
|
2015-12-02 01:58:03 +03:00
|
|
|
mc->name, pcmc->smbios_legacy_mode,
|
|
|
|
pcmc->smbios_uuid_encoded,
|
2015-09-07 12:39:28 +03:00
|
|
|
SMBIOS_ENTRY_POINT_21);
|
2013-10-30 16:56:40 +04:00
|
|
|
}
|
|
|
|
|
2010-05-14 11:29:15 +04:00
|
|
|
/* allocate ram and load rom/bios */
|
2010-06-30 15:58:34 +04:00
|
|
|
if (!xen_enabled()) {
|
2015-08-07 22:55:50 +03:00
|
|
|
pc_memory_init(pcms, system_memory,
|
2015-12-11 21:42:24 +03:00
|
|
|
rom_memory, &ram_memory);
|
2020-06-24 15:18:41 +03:00
|
|
|
} else {
|
|
|
|
pc_system_flash_cleanup_unused(pcms);
|
|
|
|
if (machine->kernel_filename != NULL) {
|
|
|
|
/* For xen HVM direct kernel boot, load linux here */
|
|
|
|
xen_load_linux(pcms);
|
|
|
|
}
|
2010-06-30 15:58:34 +04:00
|
|
|
}
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2019-10-18 16:59:06 +03:00
|
|
|
gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled);
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
if (pcmc->pci_enabled) {
|
2019-10-15 08:00:41 +03:00
|
|
|
PIIX3State *piix3;
|
|
|
|
|
2015-07-15 08:37:42 +03:00
|
|
|
pci_bus = i440fx_init(host_type,
|
|
|
|
pci_type,
|
2019-10-15 08:00:41 +03:00
|
|
|
&i440fx_state,
|
2014-05-07 18:42:57 +04:00
|
|
|
system_memory, system_io, machine->ram_size,
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->below_4g_mem_size,
|
|
|
|
x86ms->above_4g_mem_size,
|
2011-08-15 18:17:38 +04:00
|
|
|
pci_memory, ram_memory);
|
2015-11-26 19:00:28 +03:00
|
|
|
pcms->bus = pci_bus;
|
2019-10-15 08:00:41 +03:00
|
|
|
|
|
|
|
piix3 = piix3_create(pci_bus, &isa_bus);
|
|
|
|
piix3->pic = x86ms->gsi;
|
|
|
|
piix3_devfn = piix3->dev.devfn;
|
2010-05-14 11:29:15 +04:00
|
|
|
} else {
|
|
|
|
pci_bus = NULL;
|
isapc: fix segfault.
https://bugs.launchpad.net/bugs/611646
reports that ./i386-softmmu/qemu -M isapc segfaults.
This patch fixes the segfault introduced by
f885f1eaa8711c06033ceb1599e3750fb37c306f
It's because i440fx_state in pc_init1() isn't initialized.
> Core was generated by `./i386-softmmu/qemu -M isapc'.
> Program terminated with signal 11, Segmentation fault.
> [New process 19686]
> at qemu/hw/piix_pci.c:136
> (gdb) where
> at qemu/hw/piix_pci.c:136
> boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0,
> kernel_cmdline=0x6469bf "", initrd_filename=0x0,
> cpu_model=0x654d10 "486", pci_enabled=0)
> at qemu/hw/pc_piix.c:178
> boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0,
> kernel_cmdline=0x6469bf "", initrd_filename=0x0, cpu_model=0x654d10 "486")
> at qemu/hw/pc_piix.c:207
> envp=0x7fffe1f5b188)
> at qemu/vl.c:2871
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-08-04 12:43:20 +04:00
|
|
|
i440fx_state = NULL;
|
isa: Clean up error handling around isa_bus_new()
We can have at most one ISA bus. If you try to create another one,
isa_bus_new() complains to stderr and returns null.
isa_bus_new() is called in two contexts, machine's init() and device's
realize() methods. Since complaining to stderr is not proper in the
latter context, convert isa_bus_new() to Error.
Machine's init():
* mips_jazz_init(), called from the init() methods of machines
"magnum" and "pica"
* mips_r4k_init(), the init() method of machine "mips"
* pc_init1() called from the init() methods of non-q35 PC machines
* typhoon_init(), called from clipper_init(), the init() method of
machine "clipper"
These callers always create the first ISA bus, hence isa_bus_new()
can't fail. Simply pass &error_abort.
Device's realize():
* i82378_realize(), of PCI device "i82378"
* ich9_lpc_realize(), of PCI device "ICH9-LPC"
* pci_ebus_realize(), of PCI device "ebus"
* piix3_realize(), of PCI device "pci-piix3", abstract parent of
"PIIX3" and "PIIX3-xen"
* piix4_realize(), of PCI device "PIIX4"
* vt82c686b_realize(), of PCI device "VT82C686B"
Propagate the error. Note that these devices are typically created
only by machine init() methods with qdev_init_nofail() or similar. If
we screwed up and created an ISA bus before that call, we now give up
right away. Before, we'd hobble on, and typically die in
isa_bus_irqs(). Similar if someone finds a way to hot-plug one of
these critters.
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <1450370121-5768-11-git-send-email-armbru@redhat.com>
2015-12-17 19:35:18 +03:00
|
|
|
isa_bus = isa_bus_new(NULL, get_system_memory(), system_io,
|
|
|
|
&error_abort);
|
2020-10-21 17:47:16 +03:00
|
|
|
pcms->hpet_enabled = false;
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
2019-10-22 10:39:50 +03:00
|
|
|
isa_bus_irqs(isa_bus, x86ms->gsi);
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2019-10-18 16:59:09 +03:00
|
|
|
pc_i8259_create(isa_bus, gsi_state->i8259_irq);
|
2011-08-11 02:28:13 +04:00
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
if (pcmc->pci_enabled) {
|
2012-11-15 00:54:01 +04:00
|
|
|
ioapic_init_gsi(gsi_state, "i440fx");
|
2011-08-11 02:28:13 +04:00
|
|
|
}
|
|
|
|
|
2019-10-16 11:18:10 +03:00
|
|
|
if (tcg_enabled()) {
|
|
|
|
x86_register_ferr_irq(x86ms->gsi[13]);
|
|
|
|
}
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
pc_vga_init(isa_bus, pcmc->pci_enabled ? pci_bus : NULL);
|
2011-06-16 20:05:17 +04: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 11:52:57 +03:00
|
|
|
assert(pcms->vmport != ON_OFF_AUTO__MAX);
|
2015-08-07 22:55:45 +03:00
|
|
|
if (pcms->vmport == ON_OFF_AUTO_AUTO) {
|
|
|
|
pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
|
2014-11-21 19:18:52 +03:00
|
|
|
}
|
|
|
|
|
2010-05-14 11:29:15 +04:00
|
|
|
/* init basic PC hardware */
|
2020-07-02 16:25:16 +03:00
|
|
|
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
|
2018-11-07 18:24:34 +03:00
|
|
|
0x4);
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2018-03-02 12:29:06 +03:00
|
|
|
pc_nic_init(pcmc, isa_bus, pci_bus);
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2015-12-02 01:58:03 +03:00
|
|
|
if (pcmc->pci_enabled) {
|
2010-06-24 21:58:20 +04:00
|
|
|
PCIDevice *dev;
|
2020-03-17 18:05:37 +03:00
|
|
|
|
|
|
|
dev = pci_create_simple(pci_bus, piix3_devfn + 1,
|
|
|
|
xen_enabled() ? "piix3-ide-xen" : "piix3-ide");
|
2020-03-17 18:05:37 +03:00
|
|
|
pci_ide_create_devs(dev);
|
2010-06-24 21:58:20 +04:00
|
|
|
idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
|
|
|
|
idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
|
2019-07-05 17:35:54 +03:00
|
|
|
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
|
|
|
|
}
|
|
|
|
#ifdef CONFIG_IDE_ISA
|
2020-03-17 18:05:37 +03:00
|
|
|
else {
|
|
|
|
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
2019-11-15 17:50:49 +03:00
|
|
|
int i;
|
2020-03-17 18:05:37 +03:00
|
|
|
|
|
|
|
ide_drive_get(hd, ARRAY_SIZE(hd));
|
2019-11-15 17:50:49 +03:00
|
|
|
for (i = 0; i < MAX_IDE_BUS; i++) {
|
2010-06-24 21:58:20 +04:00
|
|
|
ISADevice *dev;
|
qdev: Keep global allocation counter per bus
When we have 2 separate qdev devices that both create a qbus of the
same type without specifying a bus name or device name, we end up
with two buses of the same name, such as ide.0 on the Mac machines:
dev: macio-ide, id ""
bus: ide.0
type IDE
dev: macio-ide, id ""
bus: ide.0
type IDE
If we now spawn a device that connects to a ide.0 the last created
bus gets the device, with the first created bus inaccessible to the
command line.
After some discussion on IRC we concluded that the best quick fix way
forward for this is to make automated bus-class type based allocation
count a global counter. That's what this patch implements. With this
we instead get
dev: macio-ide, id ""
bus: ide.1
type IDE
dev: macio-ide, id ""
bus: ide.0
type IDE
on the example mentioned above.
This also means that if you did -device ...,bus=ide.0 you got a device
on the first bus (the last created one) before this patch and get that
device on the second one (the first created one) now. Breaks
migration unless you change bus=ide.0 to bus=ide.1 on the destination.
This is intended and makes the bus enumeration work as expected.
As per review request follows a list of otherwise affected boards and
the reasoning for the conclusion that they are ok:
target machine bus id times
------ ------- ------ -----
aarch64 n800 i2c-bus.0 2
aarch64 n810 i2c-bus.0 2
arm n800 i2c-bus.0 2
arm n810 i2c-bus.0 2
-> Devices are only created explicitly on one of the two buses, using
s->mpu->i2c[0], so no change to the guest.
aarch64 vexpress-a15 virtio-mmio-bus.0 4
aarch64 vexpress-a9 virtio-mmio-bus.0 4
aarch64 virt virtio-mmio-bus.0 32
arm vexpress-a15 virtio-mmio-bus.0 4
arm vexpress-a9 virtio-mmio-bus.0 4
arm virt virtio-mmio-bus.0 32
-> Makes -device bus= work for all virtio-mmio buses. Breaks
migration. Workaround for migration from old to new: specify
virtio-mmio-bus.4 or .32 respectively rather than .0 on the
destination.
aarch64 xilinx-zynq-a9 usb-bus.0 2
arm xilinx-zynq-a9 usb-bus.0 2
mips64el fulong2e usb-bus.0 2
-> Normal USB operation not affected. Migration driver needs command
line to use the other bus.
i386 isapc ide.0 2
x86_64 isapc ide.0 2
mips mips ide.0 2
mips64 mips ide.0 2
mips64el mips ide.0 2
mipsel mips ide.0 2
ppc g3beige ide.0 2
ppc mac99 ide.0 2
ppc prep ide.0 2
ppc64 g3beige ide.0 2
ppc64 mac99 ide.0 2
ppc64 prep ide.0 2
-> Makes -device bus= work for all IDE buses. Breaks migration.
Workaround for migration from old to new: specify ide.1 rather than
ide.0 on the destination.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
2014-02-06 19:08:15 +04:00
|
|
|
char busname[] = "ide.0";
|
2011-12-16 01:09:51 +04:00
|
|
|
dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
|
|
|
|
ide_irq[i],
|
2010-06-24 21:58:20 +04:00
|
|
|
hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
|
qdev: Keep global allocation counter per bus
When we have 2 separate qdev devices that both create a qbus of the
same type without specifying a bus name or device name, we end up
with two buses of the same name, such as ide.0 on the Mac machines:
dev: macio-ide, id ""
bus: ide.0
type IDE
dev: macio-ide, id ""
bus: ide.0
type IDE
If we now spawn a device that connects to a ide.0 the last created
bus gets the device, with the first created bus inaccessible to the
command line.
After some discussion on IRC we concluded that the best quick fix way
forward for this is to make automated bus-class type based allocation
count a global counter. That's what this patch implements. With this
we instead get
dev: macio-ide, id ""
bus: ide.1
type IDE
dev: macio-ide, id ""
bus: ide.0
type IDE
on the example mentioned above.
This also means that if you did -device ...,bus=ide.0 you got a device
on the first bus (the last created one) before this patch and get that
device on the second one (the first created one) now. Breaks
migration unless you change bus=ide.0 to bus=ide.1 on the destination.
This is intended and makes the bus enumeration work as expected.
As per review request follows a list of otherwise affected boards and
the reasoning for the conclusion that they are ok:
target machine bus id times
------ ------- ------ -----
aarch64 n800 i2c-bus.0 2
aarch64 n810 i2c-bus.0 2
arm n800 i2c-bus.0 2
arm n810 i2c-bus.0 2
-> Devices are only created explicitly on one of the two buses, using
s->mpu->i2c[0], so no change to the guest.
aarch64 vexpress-a15 virtio-mmio-bus.0 4
aarch64 vexpress-a9 virtio-mmio-bus.0 4
aarch64 virt virtio-mmio-bus.0 32
arm vexpress-a15 virtio-mmio-bus.0 4
arm vexpress-a9 virtio-mmio-bus.0 4
arm virt virtio-mmio-bus.0 32
-> Makes -device bus= work for all virtio-mmio buses. Breaks
migration. Workaround for migration from old to new: specify
virtio-mmio-bus.4 or .32 respectively rather than .0 on the
destination.
aarch64 xilinx-zynq-a9 usb-bus.0 2
arm xilinx-zynq-a9 usb-bus.0 2
mips64el fulong2e usb-bus.0 2
-> Normal USB operation not affected. Migration driver needs command
line to use the other bus.
i386 isapc ide.0 2
x86_64 isapc ide.0 2
mips mips ide.0 2
mips64 mips ide.0 2
mips64el mips ide.0 2
mipsel mips ide.0 2
ppc g3beige ide.0 2
ppc mac99 ide.0 2
ppc prep ide.0 2
ppc64 g3beige ide.0 2
ppc64 mac99 ide.0 2
ppc64 prep ide.0 2
-> Makes -device bus= work for all IDE buses. Breaks migration.
Workaround for migration from old to new: specify ide.1 rather than
ide.0 on the destination.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
2014-02-06 19:08:15 +04:00
|
|
|
/*
|
|
|
|
* The ide bus name is ide.0 for the first bus and ide.1 for the
|
|
|
|
* second one.
|
|
|
|
*/
|
|
|
|
busname[4] = '0' + i;
|
|
|
|
idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
2019-07-05 17:35:54 +03:00
|
|
|
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
2019-07-05 17:35:54 +03:00
|
|
|
#endif
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2016-06-08 23:50:25 +03:00
|
|
|
if (pcmc->pci_enabled && machine_usb(machine)) {
|
2012-03-07 18:06:32 +04:00
|
|
|
pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
|
|
|
|
2020-03-20 13:01:36 +03:00
|
|
|
if (pcmc->pci_enabled && x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {
|
2014-06-02 17:25:24 +04:00
|
|
|
DeviceState *piix4_pm;
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2015-05-26 04:46:05 +03:00
|
|
|
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
|
2010-05-14 11:29:15 +04:00
|
|
|
/* TODO: Populate SPD eeprom data. */
|
2016-05-13 04:43:45 +03:00
|
|
|
pcms->smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->gsi[9], smi_irq,
|
2019-12-12 19:28:01 +03:00
|
|
|
x86_machine_is_smm_enabled(x86ms),
|
2016-05-13 04:43:45 +03:00
|
|
|
&piix4_pm);
|
|
|
|
smbus_eeprom_init(pcms->smbus, 8, NULL, 0);
|
2014-06-02 17:25:24 +04:00
|
|
|
|
|
|
|
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
|
|
|
|
TYPE_HOTPLUG_HANDLER,
|
2020-09-15 15:09:02 +03:00
|
|
|
(Object **)&x86ms->acpi_dev,
|
2014-06-02 17:25:24 +04:00
|
|
|
object_property_allow_set_link,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
OBJ_PROP_LINK_STRONG);
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
|
|
|
|
OBJECT(piix4_pm), &error_abort);
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
|
|
|
|
2019-03-08 21:20:53 +03:00
|
|
|
if (machine->nvdimms_state->is_enabled) {
|
|
|
|
nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
|
2020-04-21 15:59:29 +03:00
|
|
|
x86_nvdimm_acpi_dsmio,
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->fw_cfg, OBJECT(pcms));
|
2016-03-04 19:00:32 +03:00
|
|
|
}
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
|
|
|
|
2015-09-28 21:07:21 +03:00
|
|
|
/* Looking for a pc_compat_2_4() function? It doesn't exist.
|
|
|
|
* pc_compat_*() functions that run on machine-init time and
|
|
|
|
* change global QEMU state are deprecated. Please don't create
|
|
|
|
* one, and implement any pc-*-2.4 (and newer) compat code in
|
2019-07-08 23:49:09 +03:00
|
|
|
* hw_compat_*, pc_compat_*, or * pc_*_machine_options().
|
2015-09-28 21:07:21 +03:00
|
|
|
*/
|
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
static void pc_compat_2_3_fn(MachineState *machine)
|
2015-04-23 09:21:35 +03:00
|
|
|
{
|
2019-12-12 19:28:01 +03:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(machine);
|
2015-06-18 19:30:52 +03:00
|
|
|
if (kvm_enabled()) {
|
2019-12-12 19:28:01 +03:00
|
|
|
x86ms->smm = ON_OFF_AUTO_OFF;
|
2015-06-18 19:30:52 +03:00
|
|
|
}
|
2015-04-23 09:21:35 +03:00
|
|
|
}
|
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
static void pc_compat_2_2_fn(MachineState *machine)
|
2014-12-05 12:51:42 +03:00
|
|
|
{
|
2018-12-12 18:36:30 +03:00
|
|
|
pc_compat_2_3_fn(machine);
|
2014-12-05 12:51:42 +03:00
|
|
|
}
|
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
static void pc_compat_2_1_fn(MachineState *machine)
|
2014-10-29 16:26:07 +03:00
|
|
|
{
|
2018-12-12 18:36:30 +03:00
|
|
|
pc_compat_2_2_fn(machine);
|
2015-09-11 18:40:27 +03:00
|
|
|
x86_cpu_change_kvm_default("svm", NULL);
|
2014-10-29 16:26:07 +03:00
|
|
|
}
|
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
static void pc_compat_2_0_fn(MachineState *machine)
|
2014-04-24 14:14:53 +04:00
|
|
|
{
|
2018-12-12 18:36:30 +03:00
|
|
|
pc_compat_2_1_fn(machine);
|
2014-04-24 14:14:53 +04:00
|
|
|
}
|
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
static void pc_compat_1_7_fn(MachineState *machine)
|
2013-10-30 16:56:40 +04:00
|
|
|
{
|
2018-12-12 20:57:53 +03:00
|
|
|
pc_compat_2_0_fn(machine);
|
2015-09-11 18:40:27 +03:00
|
|
|
x86_cpu_change_kvm_default("x2apic", NULL);
|
2013-10-30 16:56:40 +04:00
|
|
|
}
|
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
static void pc_compat_1_6_fn(MachineState *machine)
|
2013-05-13 21:00:23 +04:00
|
|
|
{
|
2018-12-12 20:57:53 +03:00
|
|
|
pc_compat_1_7_fn(machine);
|
2013-05-13 21:00:23 +04:00
|
|
|
}
|
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
static void pc_compat_1_5_fn(MachineState *machine)
|
2013-08-01 16:39:11 +04:00
|
|
|
{
|
2018-12-12 20:57:53 +03:00
|
|
|
pc_compat_1_6_fn(machine);
|
2013-08-01 16:39:11 +04:00
|
|
|
}
|
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
static void pc_compat_1_4_fn(MachineState *machine)
|
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 19:25:03 +04:00
|
|
|
{
|
2018-12-12 20:57:53 +03:00
|
|
|
pc_compat_1_5_fn(machine);
|
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 19:25:03 +04:00
|
|
|
}
|
|
|
|
|
2014-05-07 18:42:57 +04:00
|
|
|
static void pc_init_isa(MachineState *machine)
|
2010-05-14 11:29:15 +04:00
|
|
|
{
|
2015-07-15 08:37:42 +03:00
|
|
|
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
|
2010-05-14 11:29:15 +04:00
|
|
|
}
|
|
|
|
|
2010-06-30 15:58:34 +04:00
|
|
|
#ifdef CONFIG_XEN
|
2015-07-15 08:37:49 +03:00
|
|
|
static void pc_xen_hvm_init_pci(MachineState *machine)
|
|
|
|
{
|
2020-06-03 19:04:42 +03:00
|
|
|
const char *pci_type = xen_igd_gfx_pt_enabled() ?
|
2015-07-15 08:37:49 +03:00
|
|
|
TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE;
|
|
|
|
|
|
|
|
pc_init1(machine,
|
|
|
|
TYPE_I440FX_PCI_HOST_BRIDGE,
|
|
|
|
pci_type);
|
|
|
|
}
|
|
|
|
|
2014-05-07 18:42:57 +04:00
|
|
|
static void pc_xen_hvm_init(MachineState *machine)
|
2010-06-30 15:58:34 +04:00
|
|
|
{
|
2017-11-29 11:46:28 +03:00
|
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
2013-06-25 15:46:44 +04:00
|
|
|
|
2015-09-28 23:01:23 +03:00
|
|
|
if (!xen_enabled()) {
|
|
|
|
error_report("xenfv machine requires the xen accelerator");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2015-07-15 08:37:49 +03:00
|
|
|
pc_xen_hvm_init_pci(machine);
|
2017-11-29 11:46:28 +03:00
|
|
|
pci_create_simple(pcms->bus, -1, "xen-platform");
|
2010-06-30 15:58:34 +04:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-05-15 20:19:01 +03:00
|
|
|
#define DEFINE_I440FX_MACHINE(suffix, name, compatfn, optionfn) \
|
|
|
|
static void pc_init_##suffix(MachineState *machine) \
|
|
|
|
{ \
|
|
|
|
void (*compat)(MachineState *m) = (compatfn); \
|
|
|
|
if (compat) { \
|
|
|
|
compat(machine); \
|
|
|
|
} \
|
2015-07-15 08:37:42 +03:00
|
|
|
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \
|
|
|
|
TYPE_I440FX_PCI_DEVICE); \
|
2015-05-15 20:19:01 +03:00
|
|
|
} \
|
|
|
|
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
|
2015-05-15 20:18:54 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2018-03-02 12:29:06 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
pcmc->default_nic_model = "e1000";
|
2021-03-01 22:59:18 +03:00
|
|
|
pcmc->pci_root_uid = 0;
|
2018-03-02 12:29:06 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
m->family = "pc_piix";
|
|
|
|
m->desc = "Standard PC (i440FX + PIIX, 1996)";
|
2015-09-11 23:14:24 +03:00
|
|
|
m->default_machine_opts = "firmware=bios-256k.bin";
|
|
|
|
m->default_display = "std";
|
2018-06-13 15:29:46 +03:00
|
|
|
machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
|
2020-04-24 15:34:42 +03:00
|
|
|
machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE);
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
|
|
|
|
2021-08-31 04:54:26 +03:00
|
|
|
static void pc_i440fx_6_2_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2019-06-28 03:28:42 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_machine_options(m);
|
|
|
|
m->alias = "pc";
|
2020-02-07 19:19:47 +03:00
|
|
|
m->is_default = true;
|
2019-06-28 03:28:42 +03:00
|
|
|
pcmc->default_cpu_version = 1;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2013-12-02 15:47:29 +04:00
|
|
|
|
2021-08-31 04:54:26 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v6_2, "pc-i440fx-6.2", NULL,
|
|
|
|
pc_i440fx_6_2_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_6_1_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_6_2_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
m->is_default = false;
|
|
|
|
compat_props_add(m->compat_props, hw_compat_6_1, hw_compat_6_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_6_1, pc_compat_6_1_len);
|
|
|
|
}
|
|
|
|
|
2021-03-31 14:19:00 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v6_1, "pc-i440fx-6.1", NULL,
|
|
|
|
pc_i440fx_6_1_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_6_0_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_6_1_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
m->is_default = false;
|
|
|
|
compat_props_add(m->compat_props, hw_compat_6_0, hw_compat_6_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_6_0, pc_compat_6_0_len);
|
|
|
|
}
|
|
|
|
|
2020-11-09 20:39:28 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v6_0, "pc-i440fx-6.0", NULL,
|
|
|
|
pc_i440fx_6_0_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_5_2_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_6_0_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
m->is_default = false;
|
|
|
|
compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len);
|
|
|
|
}
|
|
|
|
|
2020-08-19 17:40:16 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL,
|
|
|
|
pc_i440fx_5_2_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_5_1_machine_options(MachineClass *m)
|
|
|
|
{
|
2020-09-22 18:19:34 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
|
2020-08-19 17:40:16 +03:00
|
|
|
pc_i440fx_5_2_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
m->is_default = false;
|
|
|
|
compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len);
|
2020-09-22 18:19:34 +03:00
|
|
|
pcmc->kvmclock_create_always = false;
|
2021-03-01 22:59:18 +03:00
|
|
|
pcmc->pci_root_uid = 1;
|
2020-08-19 17:40:16 +03:00
|
|
|
}
|
|
|
|
|
2020-04-29 17:46:05 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL,
|
|
|
|
pc_i440fx_5_1_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_5_0_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_5_1_machine_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
m->is_default = false;
|
2020-06-09 16:56:35 +03:00
|
|
|
m->numa_mem_supported = true;
|
2020-04-29 17:46:05 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
|
2020-06-26 10:22:48 +03:00
|
|
|
m->auto_enable_numa_with_memdev = false;
|
2020-04-29 17:46:05 +03:00
|
|
|
}
|
|
|
|
|
2019-11-12 13:48:11 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL,
|
|
|
|
pc_i440fx_5_0_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_4_2_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_5_0_machine_options(m);
|
|
|
|
m->alias = NULL;
|
2020-02-07 19:19:47 +03:00
|
|
|
m->is_default = false;
|
2019-11-12 13:48:11 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len);
|
|
|
|
}
|
|
|
|
|
2019-07-24 13:35:24 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL,
|
|
|
|
pc_i440fx_4_2_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_4_1_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_4_2_machine_options(m);
|
|
|
|
m->alias = NULL;
|
2020-02-07 19:19:47 +03:00
|
|
|
m->is_default = false;
|
2019-07-24 13:35:24 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len);
|
|
|
|
}
|
|
|
|
|
2019-04-11 13:20:25 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL,
|
|
|
|
pc_i440fx_4_1_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_4_0_machine_options(MachineClass *m)
|
|
|
|
{
|
2019-06-28 03:28:42 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2019-04-11 13:20:25 +03:00
|
|
|
pc_i440fx_4_1_machine_options(m);
|
|
|
|
m->alias = NULL;
|
2020-02-07 19:19:47 +03:00
|
|
|
m->is_default = false;
|
2019-06-28 03:28:42 +03:00
|
|
|
pcmc->default_cpu_version = CPU_VERSION_LEGACY;
|
2019-04-11 13:20:25 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
|
|
|
|
}
|
|
|
|
|
2018-12-04 19:27:16 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
|
|
|
|
pc_i440fx_4_0_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_3_1_machine_options(MachineClass *m)
|
|
|
|
{
|
2019-01-22 15:10:48 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
|
2018-12-04 19:27:16 +03:00
|
|
|
pc_i440fx_4_0_machine_options(m);
|
2020-02-07 19:19:47 +03:00
|
|
|
m->is_default = false;
|
2016-05-13 04:43:45 +03:00
|
|
|
pcmc->do_not_add_smb_acpi = true;
|
2018-11-14 23:41:01 +03:00
|
|
|
m->smbus_no_migration_support = true;
|
2018-12-04 19:27:16 +03:00
|
|
|
m->alias = NULL;
|
2019-01-22 15:10:48 +03:00
|
|
|
pcmc->pvh_enabled = false;
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
|
2018-12-04 19:27:16 +03:00
|
|
|
}
|
|
|
|
|
2018-11-20 16:26:04 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
|
|
|
|
pc_i440fx_3_1_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_3_0_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_3_1_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_3_0, hw_compat_3_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_3_0, pc_compat_3_0_len);
|
2018-11-20 16:26:04 +03:00
|
|
|
}
|
|
|
|
|
2018-05-22 13:39:57 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
|
|
|
|
pc_i440fx_3_0_machine_options);
|
2018-05-14 19:41:50 +03:00
|
|
|
|
|
|
|
static void pc_i440fx_2_12_machine_options(MachineClass *m)
|
|
|
|
{
|
2018-05-22 13:39:57 +03:00
|
|
|
pc_i440fx_3_0_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
|
2018-05-14 19:41:50 +03:00
|
|
|
}
|
|
|
|
|
2017-12-19 06:37:29 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,
|
|
|
|
pc_i440fx_2_12_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_11_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_2_12_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len);
|
2017-12-19 06:37:29 +03:00
|
|
|
}
|
|
|
|
|
2017-09-06 17:26:57 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
|
|
|
|
pc_i440fx_2_11_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_10_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_2_11_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len);
|
2017-11-14 05:34:01 +03:00
|
|
|
m->auto_enable_numa_with_memhp = false;
|
2017-09-06 17:26:57 +03:00
|
|
|
}
|
|
|
|
|
2017-04-25 12:49:13 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
|
|
|
|
pc_i440fx_2_10_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_9_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_2_10_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len);
|
2017-04-25 12:49:13 +03:00
|
|
|
}
|
|
|
|
|
2017-01-12 21:24:16 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
|
|
|
|
pc_i440fx_2_9_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_8_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_2_9_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
|
2017-01-12 21:24:16 +03:00
|
|
|
}
|
|
|
|
|
2016-09-07 08:21:12 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
|
|
|
|
pc_i440fx_2_8_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_7_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_2_8_machine_options(m);
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len);
|
2016-09-07 08:21:12 +03:00
|
|
|
}
|
|
|
|
|
2016-05-17 17:43:10 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,
|
|
|
|
pc_i440fx_2_7_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_6_machine_options(MachineClass *m)
|
|
|
|
{
|
2016-06-15 12:25:23 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2016-05-17 17:43:10 +03:00
|
|
|
pc_i440fx_2_7_machine_options(m);
|
2016-06-15 12:25:23 +03:00
|
|
|
pcmc->legacy_cpu_hotplug = true;
|
2017-04-25 18:37:50 +03:00
|
|
|
pcmc->linuxboot_dma_enabled = false;
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
|
2016-05-17 17:43:10 +03:00
|
|
|
}
|
|
|
|
|
2015-11-30 17:56:36 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
|
|
|
|
pc_i440fx_2_6_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_5_machine_options(MachineClass *m)
|
|
|
|
{
|
2019-11-18 14:13:25 +03:00
|
|
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-11-30 17:56:36 +03:00
|
|
|
pc_i440fx_2_6_machine_options(m);
|
2019-11-18 14:13:25 +03:00
|
|
|
x86mc->save_tsc_khz = false;
|
2016-04-07 17:12:58 +03:00
|
|
|
m->legacy_fw_cfg_order = 1;
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
|
2015-11-30 17:56:36 +03:00
|
|
|
}
|
|
|
|
|
2015-09-11 23:14:25 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
|
|
|
|
pc_i440fx_2_5_machine_options);
|
|
|
|
|
|
|
|
static void pc_i440fx_2_4_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-09-11 23:14:25 +03:00
|
|
|
pc_i440fx_2_5_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.4.0";
|
2015-09-11 23:14:25 +03:00
|
|
|
pcmc->broken_reserved_end = true;
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
|
2015-09-11 23:14:25 +03:00
|
|
|
}
|
|
|
|
|
2015-05-15 20:19:01 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
|
|
|
|
pc_i440fx_2_4_machine_options)
|
2015-04-23 09:21:35 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_2_3_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-06-23 20:00:51 +03:00
|
|
|
pc_i440fx_2_4_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.3.0";
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len);
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2015-04-23 09:21:35 +03:00
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_2_3_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_2_2_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_2_3_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.2.0";
|
2018-12-05 23:58:27 +03:00
|
|
|
m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on";
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len);
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->rsdp_in_ram = false;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2014-12-05 12:51:42 +03:00
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_2_2_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_2_1_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_2_2_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.1.0";
|
2015-05-15 20:18:54 +03:00
|
|
|
m->default_display = NULL;
|
2018-12-12 18:36:30 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_2_1, hw_compat_2_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_2_1, pc_compat_2_1_len);
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->smbios_uuid_encoded = false;
|
2015-12-02 01:58:06 +03:00
|
|
|
pcmc->enforce_aligned_dimm = false;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2014-07-30 11:02:00 +04:00
|
|
|
|
2018-12-12 18:36:30 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_2_1_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_2_0_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_2_1_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.0.0";
|
2018-12-12 20:57:53 +03:00
|
|
|
compat_props_add(m->compat_props, pc_compat_2_0, pc_compat_2_0_len);
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->smbios_legacy_mode = true;
|
|
|
|
pcmc->has_reserved_memory = false;
|
2015-12-02 01:58:04 +03:00
|
|
|
/* This value depends on the actual DSDT and SSDT compiled into
|
|
|
|
* the source QEMU; unfortunately it depends on the binary and
|
|
|
|
* not on the machine type, so we cannot make pc-i440fx-1.7 work on
|
|
|
|
* both QEMU 1.7 and QEMU 2.0.
|
|
|
|
*
|
|
|
|
* Large variations cause migration to fail for more than one
|
|
|
|
* consecutive value of the "-smp" maxcpus option.
|
|
|
|
*
|
|
|
|
* For small variations of the kind caused by different iasl versions,
|
|
|
|
* the 4k rounding usually leaves slack. However, there could be still
|
|
|
|
* one or two values that break. For QEMU 1.7 and QEMU 2.0 the
|
|
|
|
* slack is only ~10 bytes before one "-smp maxcpus" value breaks!
|
|
|
|
*
|
|
|
|
* 6652 is valid for QEMU 2.0, the right value for pc-i440fx-1.7 on
|
|
|
|
* QEMU 1.7 it is 6414. For RHEL/CentOS 7.0 it is 6418.
|
|
|
|
*/
|
|
|
|
pcmc->legacy_acpi_table_size = 6652;
|
2015-12-02 01:58:05 +03:00
|
|
|
pcmc->acpi_data_size = 0x10000;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2014-04-24 14:14:53 +04:00
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_2_0_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_1_7_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_2_0_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "1.7.0";
|
2015-05-15 20:18:54 +03:00
|
|
|
m->default_machine_opts = NULL;
|
2015-12-02 01:58:08 +03:00
|
|
|
m->option_rom_has_mr = true;
|
2018-12-12 20:57:53 +03:00
|
|
|
compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len);
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->smbios_defaults = false;
|
|
|
|
pcmc->gigabyte_align = false;
|
2015-12-02 01:58:04 +03:00
|
|
|
pcmc->legacy_acpi_table_size = 6414;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2013-12-02 15:47:29 +04:00
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_1_7_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_1_6_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
pc_i440fx_1_7_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "1.6.0";
|
2015-12-02 01:58:08 +03:00
|
|
|
m->rom_file_has_mr = false;
|
2018-12-12 20:57:53 +03:00
|
|
|
compat_props_add(m->compat_props, pc_compat_1_6, pc_compat_1_6_len);
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->has_acpi_build = false;
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2013-08-27 10:48:06 +04:00
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_1_6_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_1_5_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
|
|
|
pc_i440fx_1_6_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "1.5.0";
|
2018-12-12 20:57:53 +03:00
|
|
|
compat_props_add(m->compat_props, pc_compat_1_5, pc_compat_1_5_len);
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
pc: Define MACHINE_OPTIONS macros consistently for all machines
Define a MACHINE_OPTIONS macro for each PC machine, and move every field
inside the QEMUMachine structs to the macros, except for name, init, and
compat_props.
This also ensures that all MACHINE_OPTIONS inherit the fields from the
next version, so their definitions carry only the changes that exist
between one version and the next one.
Comments about specific cases:
pc-*-2.1:
Existing PC_*_2_1_MACHINE_OPTIONS macros were defined as:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin"
PC_*_2_2_MACHINE_OPTIONS is:
PC_*_2_3_MACHINE_OPTIONS
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std"
The only difference between 2_1 and 2_2 is .default_display, that's why
we didn't reuse PC_*_2_2_MACHINE_OPTIONS. The good news is that having
multiple initializers for a field is allowed by C99, and the last
initializer overrides the previous ones.
So we can reuse the 2_2 macro in 2_1 and define PC_*_2_1_MACHINE_OPTIONS
as:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
pc-*-1.7:
PC_*_1_7_MACHINE_OPTIONS was defined as:
PC_*_MACHINE_OPTIONS
PC_*_2_0_MACHINE_OPTIONS is defined as:
PC_*_2_1_MACHINE_OPTIONS
which is expanded to:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_2_3_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std",
.default_display = NULL /* overrides the previous line */
So, the only difference between PC_*_1_7_MACHINE_OPTIONS and
PC_*_2_0_MACHINE_OPTIONS is .default_machine_opts (as .default_display
is not explicitly set by PC_*_MACHINE_OPTIONS so it is NULL).
So we can keep the macro reuse pattern and define
PC_*_2_0_MACHINE_OPTIONS as:
PC_*_2_0_MACHINE_OPTIONS,
.default_machine_opts = NULL
pc-*-2.4 (alias and is_default fields):
Set alias and is_default fields inside the 2.4 MACHINE_OPTIONS macro,
and clear it in the 2.3 macro (that reuses the 2.4 macro).
hw_machine:
As all the machines older than v1.0 set hw_version explicitly, we can
safely move the field to the MACHINE_OPTIONS macros without affecting
the other versions that reuse them.
init function:
Some machines had the init function set inside the MACHINE_OPTIONS
macro. Move it to the QEMUMachine declaration, to keep it consistent
with the other machines.
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>
2015-05-15 20:18:52 +03:00
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_1_5_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_i440fx_1_4_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
|
|
|
pc_i440fx_1_5_machine_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "1.4.0";
|
2018-12-12 20:57:53 +03:00
|
|
|
compat_props_add(m->compat_props, pc_compat_1_4, pc_compat_1_4_len);
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
2013-08-27 10:48:06 +04:00
|
|
|
|
2018-12-12 20:57:53 +03:00
|
|
|
DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4_fn,
|
2015-05-15 20:19:01 +03:00
|
|
|
pc_i440fx_1_4_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2015-07-15 08:37:47 +03:00
|
|
|
typedef struct {
|
|
|
|
uint16_t gpu_device_id;
|
|
|
|
uint16_t pch_device_id;
|
|
|
|
uint8_t pch_revision_id;
|
|
|
|
} IGDDeviceIDInfo;
|
|
|
|
|
|
|
|
/* In real world different GPU should have different PCH. But actually
|
|
|
|
* the different PCH DIDs likely map to different PCH SKUs. We do the
|
|
|
|
* same thing for the GPU. For PCH, the different SKUs are going to be
|
|
|
|
* all the same silicon design and implementation, just different
|
|
|
|
* features turn on and off with fuses. The SW interfaces should be
|
|
|
|
* consistent across all SKUs in a given family (eg LPT). But just same
|
|
|
|
* features may not be supported.
|
|
|
|
*
|
|
|
|
* Most of these different PCH features probably don't matter to the
|
|
|
|
* Gfx driver, but obviously any difference in display port connections
|
|
|
|
* will so it should be fine with any PCH in case of passthrough.
|
|
|
|
*
|
|
|
|
* So currently use one PCH version, 0x8c4e, to cover all HSW(Haswell)
|
|
|
|
* scenarios, 0x9cc3 for BDW(Broadwell).
|
|
|
|
*/
|
|
|
|
static const IGDDeviceIDInfo igd_combo_id_infos[] = {
|
|
|
|
/* HSW Classic */
|
|
|
|
{0x0402, 0x8c4e, 0x04}, /* HSWGT1D, HSWD_w7 */
|
|
|
|
{0x0406, 0x8c4e, 0x04}, /* HSWGT1M, HSWM_w7 */
|
|
|
|
{0x0412, 0x8c4e, 0x04}, /* HSWGT2D, HSWD_w7 */
|
|
|
|
{0x0416, 0x8c4e, 0x04}, /* HSWGT2M, HSWM_w7 */
|
|
|
|
{0x041E, 0x8c4e, 0x04}, /* HSWGT15D, HSWD_w7 */
|
|
|
|
/* HSW ULT */
|
|
|
|
{0x0A06, 0x8c4e, 0x04}, /* HSWGT1UT, HSWM_w7 */
|
|
|
|
{0x0A16, 0x8c4e, 0x04}, /* HSWGT2UT, HSWM_w7 */
|
|
|
|
{0x0A26, 0x8c4e, 0x06}, /* HSWGT3UT, HSWM_w7 */
|
|
|
|
{0x0A2E, 0x8c4e, 0x04}, /* HSWGT3UT28W, HSWM_w7 */
|
|
|
|
{0x0A1E, 0x8c4e, 0x04}, /* HSWGT2UX, HSWM_w7 */
|
|
|
|
{0x0A0E, 0x8c4e, 0x04}, /* HSWGT1ULX, HSWM_w7 */
|
|
|
|
/* HSW CRW */
|
|
|
|
{0x0D26, 0x8c4e, 0x04}, /* HSWGT3CW, HSWM_w7 */
|
|
|
|
{0x0D22, 0x8c4e, 0x04}, /* HSWGT3CWDT, HSWD_w7 */
|
|
|
|
/* HSW Server */
|
|
|
|
{0x041A, 0x8c4e, 0x04}, /* HSWSVGT2, HSWD_w7 */
|
|
|
|
/* HSW SRVR */
|
|
|
|
{0x040A, 0x8c4e, 0x04}, /* HSWSVGT1, HSWD_w7 */
|
|
|
|
/* BSW */
|
|
|
|
{0x1606, 0x9cc3, 0x03}, /* BDWULTGT1, BDWM_w7 */
|
|
|
|
{0x1616, 0x9cc3, 0x03}, /* BDWULTGT2, BDWM_w7 */
|
|
|
|
{0x1626, 0x9cc3, 0x03}, /* BDWULTGT3, BDWM_w7 */
|
|
|
|
{0x160E, 0x9cc3, 0x03}, /* BDWULXGT1, BDWM_w7 */
|
|
|
|
{0x161E, 0x9cc3, 0x03}, /* BDWULXGT2, BDWM_w7 */
|
|
|
|
{0x1602, 0x9cc3, 0x03}, /* BDWHALOGT1, BDWM_w7 */
|
|
|
|
{0x1612, 0x9cc3, 0x03}, /* BDWHALOGT2, BDWM_w7 */
|
|
|
|
{0x1622, 0x9cc3, 0x03}, /* BDWHALOGT3, BDWM_w7 */
|
|
|
|
{0x162B, 0x9cc3, 0x03}, /* BDWHALO28W, BDWM_w7 */
|
|
|
|
{0x162A, 0x9cc3, 0x03}, /* BDWGT3WRKS, BDWM_w7 */
|
|
|
|
{0x162D, 0x9cc3, 0x03}, /* BDWGT3SRVR, BDWM_w7 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static void isa_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
dc->desc = "ISA bridge faked to support IGD PT";
|
2019-03-27 19:53:56 +03:00
|
|
|
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
2015-07-15 08:37:47 +03:00
|
|
|
k->vendor_id = PCI_VENDOR_ID_INTEL;
|
|
|
|
k->class_id = PCI_CLASS_BRIDGE_ISA;
|
|
|
|
};
|
|
|
|
|
|
|
|
static TypeInfo isa_bridge_info = {
|
|
|
|
.name = "igd-passthrough-isa-bridge",
|
|
|
|
.parent = TYPE_PCI_DEVICE,
|
|
|
|
.instance_size = sizeof(PCIDevice),
|
|
|
|
.class_init = isa_bridge_class_init,
|
2017-09-27 22:56:34 +03:00
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
|
|
|
|
{ },
|
|
|
|
},
|
2015-07-15 08:37:47 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static void pt_graphics_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&isa_bridge_info);
|
|
|
|
}
|
|
|
|
type_init(pt_graphics_register_types)
|
|
|
|
|
|
|
|
void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id)
|
|
|
|
{
|
|
|
|
struct PCIDevice *bridge_dev;
|
|
|
|
int i, num;
|
|
|
|
uint16_t pch_dev_id = 0xffff;
|
2020-09-09 14:27:38 +03:00
|
|
|
uint8_t pch_rev_id = 0;
|
2015-07-15 08:37:47 +03:00
|
|
|
|
|
|
|
num = ARRAY_SIZE(igd_combo_id_infos);
|
|
|
|
for (i = 0; i < num; i++) {
|
|
|
|
if (gpu_dev_id == igd_combo_id_infos[i].gpu_device_id) {
|
|
|
|
pch_dev_id = igd_combo_id_infos[i].pch_device_id;
|
|
|
|
pch_rev_id = igd_combo_id_infos[i].pch_revision_id;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pch_dev_id == 0xffff) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Currently IGD drivers always need to access PCH by 1f.0. */
|
|
|
|
bridge_dev = pci_create_simple(bus, PCI_DEVFN(0x1f, 0),
|
|
|
|
"igd-passthrough-isa-bridge");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note that vendor id is always PCI_VENDOR_ID_INTEL.
|
|
|
|
*/
|
|
|
|
if (!bridge_dev) {
|
|
|
|
fprintf(stderr, "set igd-passthrough-isa-bridge failed!\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
pci_config_set_device_id(bridge_dev->config, pch_dev_id);
|
|
|
|
pci_config_set_revision(bridge_dev->config, pch_rev_id);
|
|
|
|
}
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void isapc_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-12-02 01:58:03 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2015-05-15 20:18:54 +03:00
|
|
|
m->desc = "ISA-only PC";
|
|
|
|
m->max_cpus = 1;
|
2015-12-02 01:58:08 +03:00
|
|
|
m->option_rom_has_mr = true;
|
|
|
|
m->rom_file_has_mr = false;
|
2015-12-02 01:58:03 +03:00
|
|
|
pcmc->pci_enabled = false;
|
|
|
|
pcmc->has_acpi_build = false;
|
|
|
|
pcmc->smbios_defaults = false;
|
|
|
|
pcmc->gigabyte_align = false;
|
|
|
|
pcmc->smbios_legacy_mode = true;
|
|
|
|
pcmc->has_reserved_memory = false;
|
2018-03-02 12:29:06 +03:00
|
|
|
pcmc->default_nic_model = "ne2k_isa";
|
2017-09-13 19:04:56 +03:00
|
|
|
m->default_cpu_type = X86_CPU_TYPE_NAME("486");
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
pc: Define MACHINE_OPTIONS macros consistently for all machines
Define a MACHINE_OPTIONS macro for each PC machine, and move every field
inside the QEMUMachine structs to the macros, except for name, init, and
compat_props.
This also ensures that all MACHINE_OPTIONS inherit the fields from the
next version, so their definitions carry only the changes that exist
between one version and the next one.
Comments about specific cases:
pc-*-2.1:
Existing PC_*_2_1_MACHINE_OPTIONS macros were defined as:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin"
PC_*_2_2_MACHINE_OPTIONS is:
PC_*_2_3_MACHINE_OPTIONS
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std"
The only difference between 2_1 and 2_2 is .default_display, that's why
we didn't reuse PC_*_2_2_MACHINE_OPTIONS. The good news is that having
multiple initializers for a field is allowed by C99, and the last
initializer overrides the previous ones.
So we can reuse the 2_2 macro in 2_1 and define PC_*_2_1_MACHINE_OPTIONS
as:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
pc-*-1.7:
PC_*_1_7_MACHINE_OPTIONS was defined as:
PC_*_MACHINE_OPTIONS
PC_*_2_0_MACHINE_OPTIONS is defined as:
PC_*_2_1_MACHINE_OPTIONS
which is expanded to:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_2_3_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std",
.default_display = NULL /* overrides the previous line */
So, the only difference between PC_*_1_7_MACHINE_OPTIONS and
PC_*_2_0_MACHINE_OPTIONS is .default_machine_opts (as .default_display
is not explicitly set by PC_*_MACHINE_OPTIONS so it is NULL).
So we can keep the macro reuse pattern and define
PC_*_2_0_MACHINE_OPTIONS as:
PC_*_2_0_MACHINE_OPTIONS,
.default_machine_opts = NULL
pc-*-2.4 (alias and is_default fields):
Set alias and is_default fields inside the 2.4 MACHINE_OPTIONS macro,
and clear it in the 2.3 macro (that reuses the 2.4 macro).
hw_machine:
As all the machines older than v1.0 set hw_version explicitly, we can
safely move the field to the MACHINE_OPTIONS macros without affecting
the other versions that reuse them.
init function:
Some machines had the init function set inside the MACHINE_OPTIONS
macro. Move it to the QEMUMachine declaration, to keep it consistent
with the other machines.
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>
2015-05-15 20:18:52 +03:00
|
|
|
|
2015-05-15 20:18:53 +03:00
|
|
|
DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
|
2015-05-15 20:18:55 +03:00
|
|
|
isapc_machine_options);
|
2015-05-15 20:18:53 +03:00
|
|
|
|
2010-05-14 11:29:15 +04:00
|
|
|
|
2010-06-30 15:58:34 +04:00
|
|
|
#ifdef CONFIG_XEN
|
piix: fix xenfv regression, add compat machine xenfv-4.2
With QEMU 4.0 an incompatible change was added to pc_piix, which makes it
practical impossible to migrate domUs started with qemu2 or qemu3 to
newer qemu versions. Commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea
added and enabled a new member "smbus_no_migration_support". In commit
4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new
elements, which are conditionally filled. As a result, an incoming
migration expected smbus related data unless smbus migration was
disabled for a given MachineClass. Since first commit forgot to handle
'xenfv', domUs started with QEMU 4.x are incompatible with their QEMU
siblings.
Using other existing machine types, such as 'pc-i440fx-3.1', is not
possible because 'xenfv' creates the 'xen-platform' PCI device at
00:02.0, while all other variants to run a domU would create it at
00:04.0.
To cover both the existing and the broken case of 'xenfv' in a single
qemu binary, a new compatibility variant of 'xenfv-4.2' must be added
which targets domUs started with qemu 4.2. The existing 'xenfv' restores
compatibility of QEMU 5.x with qemu 3.1.
Host admins who started domUs with QEMU 4.x (preferrable QEMU 4.2)
have to use a wrapper script which appends '-machine xenfv-4.2' to
the device-model command line. This is only required if there is no
maintenance window which allows to temporary shutdown the domU and
restart it with a fixed device-model.
The wrapper script is as simple as this:
#!/bin/sh
exec /usr/bin/qemu-system-i386 "$@" -machine xenfv-4.2
With xl this script will be enabled with device_model_override=, see
xl.cfg(5). To live migrate a domU, adjust the existing domU.cfg and pass
it to xl migrate or xl save/restore:
xl migrate -C new-domU.cfg domU remote-host
xl save domU CheckpointFile new-domU.cfg
xl restore new-domU.cfg CheckpointFile
With libvirt this script will be enabled with the <emulator> element in
domU.xml. Use 'virsh edit' prior 'virsh migrate' to replace the existing
<emulator> element to point it to the wrapper script.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-Id: <20200327151841.13877-1-olaf@aepfle.de>
[Adjust tests for blacklisted machine types, simplifying the one in
qom-test. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-03-27 18:18:40 +03:00
|
|
|
static void xenfv_4_2_machine_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
piix: fix xenfv regression, add compat machine xenfv-4.2
With QEMU 4.0 an incompatible change was added to pc_piix, which makes it
practical impossible to migrate domUs started with qemu2 or qemu3 to
newer qemu versions. Commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea
added and enabled a new member "smbus_no_migration_support". In commit
4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new
elements, which are conditionally filled. As a result, an incoming
migration expected smbus related data unless smbus migration was
disabled for a given MachineClass. Since first commit forgot to handle
'xenfv', domUs started with QEMU 4.x are incompatible with their QEMU
siblings.
Using other existing machine types, such as 'pc-i440fx-3.1', is not
possible because 'xenfv' creates the 'xen-platform' PCI device at
00:02.0, while all other variants to run a domU would create it at
00:04.0.
To cover both the existing and the broken case of 'xenfv' in a single
qemu binary, a new compatibility variant of 'xenfv-4.2' must be added
which targets domUs started with qemu 4.2. The existing 'xenfv' restores
compatibility of QEMU 5.x with qemu 3.1.
Host admins who started domUs with QEMU 4.x (preferrable QEMU 4.2)
have to use a wrapper script which appends '-machine xenfv-4.2' to
the device-model command line. This is only required if there is no
maintenance window which allows to temporary shutdown the domU and
restart it with a fixed device-model.
The wrapper script is as simple as this:
#!/bin/sh
exec /usr/bin/qemu-system-i386 "$@" -machine xenfv-4.2
With xl this script will be enabled with device_model_override=, see
xl.cfg(5). To live migrate a domU, adjust the existing domU.cfg and pass
it to xl migrate or xl save/restore:
xl migrate -C new-domU.cfg domU remote-host
xl save domU CheckpointFile new-domU.cfg
xl restore new-domU.cfg CheckpointFile
With libvirt this script will be enabled with the <emulator> element in
domU.xml. Use 'virsh edit' prior 'virsh migrate' to replace the existing
<emulator> element to point it to the wrapper script.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-Id: <20200327151841.13877-1-olaf@aepfle.de>
[Adjust tests for blacklisted machine types, simplifying the one in
qom-test. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-03-27 18:18:40 +03:00
|
|
|
pc_i440fx_4_2_machine_options(m);
|
|
|
|
m->desc = "Xen Fully-virtualized PC";
|
|
|
|
m->max_cpus = HVM_MAX_VCPUS;
|
2020-10-13 22:05:06 +03:00
|
|
|
m->default_machine_opts = "accel=xen,suppress-vmdesc=on";
|
piix: fix xenfv regression, add compat machine xenfv-4.2
With QEMU 4.0 an incompatible change was added to pc_piix, which makes it
practical impossible to migrate domUs started with qemu2 or qemu3 to
newer qemu versions. Commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea
added and enabled a new member "smbus_no_migration_support". In commit
4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new
elements, which are conditionally filled. As a result, an incoming
migration expected smbus related data unless smbus migration was
disabled for a given MachineClass. Since first commit forgot to handle
'xenfv', domUs started with QEMU 4.x are incompatible with their QEMU
siblings.
Using other existing machine types, such as 'pc-i440fx-3.1', is not
possible because 'xenfv' creates the 'xen-platform' PCI device at
00:02.0, while all other variants to run a domU would create it at
00:04.0.
To cover both the existing and the broken case of 'xenfv' in a single
qemu binary, a new compatibility variant of 'xenfv-4.2' must be added
which targets domUs started with qemu 4.2. The existing 'xenfv' restores
compatibility of QEMU 5.x with qemu 3.1.
Host admins who started domUs with QEMU 4.x (preferrable QEMU 4.2)
have to use a wrapper script which appends '-machine xenfv-4.2' to
the device-model command line. This is only required if there is no
maintenance window which allows to temporary shutdown the domU and
restart it with a fixed device-model.
The wrapper script is as simple as this:
#!/bin/sh
exec /usr/bin/qemu-system-i386 "$@" -machine xenfv-4.2
With xl this script will be enabled with device_model_override=, see
xl.cfg(5). To live migrate a domU, adjust the existing domU.cfg and pass
it to xl migrate or xl save/restore:
xl migrate -C new-domU.cfg domU remote-host
xl save domU CheckpointFile new-domU.cfg
xl restore new-domU.cfg CheckpointFile
With libvirt this script will be enabled with the <emulator> element in
domU.xml. Use 'virsh edit' prior 'virsh migrate' to replace the existing
<emulator> element to point it to the wrapper script.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-Id: <20200327151841.13877-1-olaf@aepfle.de>
[Adjust tests for blacklisted machine types, simplifying the one in
qom-test. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-03-27 18:18:40 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init,
|
|
|
|
xenfv_4_2_machine_options);
|
|
|
|
|
|
|
|
static void xenfv_3_1_machine_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_i440fx_3_1_machine_options(m);
|
2015-05-15 20:18:54 +03:00
|
|
|
m->desc = "Xen Fully-virtualized PC";
|
piix: fix xenfv regression, add compat machine xenfv-4.2
With QEMU 4.0 an incompatible change was added to pc_piix, which makes it
practical impossible to migrate domUs started with qemu2 or qemu3 to
newer qemu versions. Commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea
added and enabled a new member "smbus_no_migration_support". In commit
4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new
elements, which are conditionally filled. As a result, an incoming
migration expected smbus related data unless smbus migration was
disabled for a given MachineClass. Since first commit forgot to handle
'xenfv', domUs started with QEMU 4.x are incompatible with their QEMU
siblings.
Using other existing machine types, such as 'pc-i440fx-3.1', is not
possible because 'xenfv' creates the 'xen-platform' PCI device at
00:02.0, while all other variants to run a domU would create it at
00:04.0.
To cover both the existing and the broken case of 'xenfv' in a single
qemu binary, a new compatibility variant of 'xenfv-4.2' must be added
which targets domUs started with qemu 4.2. The existing 'xenfv' restores
compatibility of QEMU 5.x with qemu 3.1.
Host admins who started domUs with QEMU 4.x (preferrable QEMU 4.2)
have to use a wrapper script which appends '-machine xenfv-4.2' to
the device-model command line. This is only required if there is no
maintenance window which allows to temporary shutdown the domU and
restart it with a fixed device-model.
The wrapper script is as simple as this:
#!/bin/sh
exec /usr/bin/qemu-system-i386 "$@" -machine xenfv-4.2
With xl this script will be enabled with device_model_override=, see
xl.cfg(5). To live migrate a domU, adjust the existing domU.cfg and pass
it to xl migrate or xl save/restore:
xl migrate -C new-domU.cfg domU remote-host
xl save domU CheckpointFile new-domU.cfg
xl restore new-domU.cfg CheckpointFile
With libvirt this script will be enabled with the <emulator> element in
domU.xml. Use 'virsh edit' prior 'virsh migrate' to replace the existing
<emulator> element to point it to the wrapper script.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-Id: <20200327151841.13877-1-olaf@aepfle.de>
[Adjust tests for blacklisted machine types, simplifying the one in
qom-test. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-03-27 18:18:40 +03:00
|
|
|
m->alias = "xenfv";
|
2015-05-15 20:18:54 +03:00
|
|
|
m->max_cpus = HVM_MAX_VCPUS;
|
2020-10-13 22:05:06 +03:00
|
|
|
m->default_machine_opts = "accel=xen,suppress-vmdesc=on";
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
pc: Define MACHINE_OPTIONS macros consistently for all machines
Define a MACHINE_OPTIONS macro for each PC machine, and move every field
inside the QEMUMachine structs to the macros, except for name, init, and
compat_props.
This also ensures that all MACHINE_OPTIONS inherit the fields from the
next version, so their definitions carry only the changes that exist
between one version and the next one.
Comments about specific cases:
pc-*-2.1:
Existing PC_*_2_1_MACHINE_OPTIONS macros were defined as:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin"
PC_*_2_2_MACHINE_OPTIONS is:
PC_*_2_3_MACHINE_OPTIONS
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std"
The only difference between 2_1 and 2_2 is .default_display, that's why
we didn't reuse PC_*_2_2_MACHINE_OPTIONS. The good news is that having
multiple initializers for a field is allowed by C99, and the last
initializer overrides the previous ones.
So we can reuse the 2_2 macro in 2_1 and define PC_*_2_1_MACHINE_OPTIONS
as:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
pc-*-1.7:
PC_*_1_7_MACHINE_OPTIONS was defined as:
PC_*_MACHINE_OPTIONS
PC_*_2_0_MACHINE_OPTIONS is defined as:
PC_*_2_1_MACHINE_OPTIONS
which is expanded to:
PC_*_2_2_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_2_3_MACHINE_OPTIONS,
.default_display = NULL
which is expanded to:
PC_*_MACHINE_OPTIONS,
.default_machine_opts = "firmware=bios-256k.bin",
.default_display = "std",
.default_display = NULL /* overrides the previous line */
So, the only difference between PC_*_1_7_MACHINE_OPTIONS and
PC_*_2_0_MACHINE_OPTIONS is .default_machine_opts (as .default_display
is not explicitly set by PC_*_MACHINE_OPTIONS so it is NULL).
So we can keep the macro reuse pattern and define
PC_*_2_0_MACHINE_OPTIONS as:
PC_*_2_0_MACHINE_OPTIONS,
.default_machine_opts = NULL
pc-*-2.4 (alias and is_default fields):
Set alias and is_default fields inside the 2.4 MACHINE_OPTIONS macro,
and clear it in the 2.3 macro (that reuses the 2.4 macro).
hw_machine:
As all the machines older than v1.0 set hw_version explicitly, we can
safely move the field to the MACHINE_OPTIONS macros without affecting
the other versions that reuse them.
init function:
Some machines had the init function set inside the MACHINE_OPTIONS
macro. Move it to the QEMUMachine declaration, to keep it consistent
with the other machines.
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>
2015-05-15 20:18:52 +03:00
|
|
|
|
piix: fix xenfv regression, add compat machine xenfv-4.2
With QEMU 4.0 an incompatible change was added to pc_piix, which makes it
practical impossible to migrate domUs started with qemu2 or qemu3 to
newer qemu versions. Commit 7fccf2a06890e3bc3b30e29827ad3fb93fe88fea
added and enabled a new member "smbus_no_migration_support". In commit
4ab2f2a8aabfea95cc53c64e13b3f67960b27fdf the vmstate_acpi got new
elements, which are conditionally filled. As a result, an incoming
migration expected smbus related data unless smbus migration was
disabled for a given MachineClass. Since first commit forgot to handle
'xenfv', domUs started with QEMU 4.x are incompatible with their QEMU
siblings.
Using other existing machine types, such as 'pc-i440fx-3.1', is not
possible because 'xenfv' creates the 'xen-platform' PCI device at
00:02.0, while all other variants to run a domU would create it at
00:04.0.
To cover both the existing and the broken case of 'xenfv' in a single
qemu binary, a new compatibility variant of 'xenfv-4.2' must be added
which targets domUs started with qemu 4.2. The existing 'xenfv' restores
compatibility of QEMU 5.x with qemu 3.1.
Host admins who started domUs with QEMU 4.x (preferrable QEMU 4.2)
have to use a wrapper script which appends '-machine xenfv-4.2' to
the device-model command line. This is only required if there is no
maintenance window which allows to temporary shutdown the domU and
restart it with a fixed device-model.
The wrapper script is as simple as this:
#!/bin/sh
exec /usr/bin/qemu-system-i386 "$@" -machine xenfv-4.2
With xl this script will be enabled with device_model_override=, see
xl.cfg(5). To live migrate a domU, adjust the existing domU.cfg and pass
it to xl migrate or xl save/restore:
xl migrate -C new-domU.cfg domU remote-host
xl save domU CheckpointFile new-domU.cfg
xl restore new-domU.cfg CheckpointFile
With libvirt this script will be enabled with the <emulator> element in
domU.xml. Use 'virsh edit' prior 'virsh migrate' to replace the existing
<emulator> element to point it to the wrapper script.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Message-Id: <20200327151841.13877-1-olaf@aepfle.de>
[Adjust tests for blacklisted machine types, simplifying the one in
qom-test. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2020-03-27 18:18:40 +03:00
|
|
|
DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
|
|
|
|
xenfv_3_1_machine_options);
|
2010-06-30 15:58:34 +04:00
|
|
|
#endif
|