2012-11-15 00:54:06 +04: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.
|
|
|
|
*/
|
2018-02-01 14:18:31 +03:00
|
|
|
|
2016-01-26 21:17:03 +03:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-29 17:22:13 +03:00
|
|
|
#include "qemu/units.h"
|
2024-02-19 13:13:48 +03:00
|
|
|
#include "hw/acpi/acpi.h"
|
2023-06-12 11:12:38 +03:00
|
|
|
#include "hw/char/parallel-isa.h"
|
2013-08-19 18:26:55 +04:00
|
|
|
#include "hw/loader.h"
|
2018-11-14 03:31:27 +03:00
|
|
|
#include "hw/i2c/smbus_eeprom.h"
|
2019-10-04 02:03:53 +03:00
|
|
|
#include "hw/rtc/mc146818rtc.h"
|
2023-09-04 15:43:12 +03:00
|
|
|
#include "sysemu/tcg.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/kvm.h"
|
2023-06-20 08:50:26 +03:00
|
|
|
#include "hw/i386/kvm/clock.h"
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/pci-host/q35.h"
|
2021-07-13 03:42:02 +03:00
|
|
|
#include "hw/pci/pcie_port.h"
|
2019-08-12 08:23:51 +03:00
|
|
|
#include "hw/qdev-properties.h"
|
2019-10-08 12:56:49 +03:00
|
|
|
#include "hw/i386/x86.h"
|
2016-03-07 22:22:05 +03:00
|
|
|
#include "hw/i386/pc.h"
|
2017-11-25 18:16:10 +03:00
|
|
|
#include "hw/i386/amd_iommu.h"
|
|
|
|
#include "hw/i386/intel_iommu.h"
|
2024-03-07 16:43:08 +03:00
|
|
|
#include "hw/virtio/virtio-iommu.h"
|
2018-06-13 15:29:46 +03:00
|
|
|
#include "hw/display/ramfb.h"
|
2012-11-15 00:54:06 +04:00
|
|
|
#include "hw/ide/pci.h"
|
2024-02-13 10:20:43 +03:00
|
|
|
#include "hw/ide/ahci-pci.h"
|
2023-02-13 20:30:31 +03:00
|
|
|
#include "hw/intc/ioapic.h"
|
2023-02-13 20:30:33 +03:00
|
|
|
#include "hw/southbridge/ich9.h"
|
2012-11-15 00:54:06 +04:00
|
|
|
#include "hw/usb.h"
|
2023-01-09 20:23:21 +03:00
|
|
|
#include "hw/usb/hcd-uhci.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"
|
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"
|
2023-09-04 15:43:13 +03:00
|
|
|
#include "target/i386/cpu.h"
|
2012-11-15 00:54:06 +04:00
|
|
|
|
|
|
|
/* ICH9 AHCI has 6 ports */
|
|
|
|
#define MAX_SATA_PORTS 6
|
|
|
|
|
2024-03-07 16:43:08 +03:00
|
|
|
static GlobalProperty pc_q35_compat_defaults[] = {
|
|
|
|
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "39" },
|
|
|
|
};
|
|
|
|
static const size_t pc_q35_compat_defaults_len =
|
|
|
|
G_N_ELEMENTS(pc_q35_compat_defaults);
|
|
|
|
|
2018-12-17 19:32:38 +03:00
|
|
|
struct ehci_companions {
|
|
|
|
const char *name;
|
|
|
|
int func;
|
|
|
|
int port;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct ehci_companions ich9_1d[] = {
|
2023-01-09 20:23:21 +03:00
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(1), .func = 0, .port = 0 },
|
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(2), .func = 1, .port = 2 },
|
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(3), .func = 2, .port = 4 },
|
2018-12-17 19:32:38 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct ehci_companions ich9_1a[] = {
|
2023-01-09 20:23:21 +03:00
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(4), .func = 0, .port = 0 },
|
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(5), .func = 1, .port = 2 },
|
|
|
|
{ .name = TYPE_ICH9_USB_UHCI(6), .func = 2, .port = 4 },
|
2018-12-17 19:32:38 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static int ehci_create_ich9_with_companions(PCIBus *bus, int slot)
|
|
|
|
{
|
|
|
|
const struct ehci_companions *comp;
|
|
|
|
PCIDevice *ehci, *uhci;
|
|
|
|
BusState *usbbus;
|
|
|
|
const char *name;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
switch (slot) {
|
|
|
|
case 0x1d:
|
|
|
|
name = "ich9-usb-ehci1";
|
|
|
|
comp = ich9_1d;
|
|
|
|
break;
|
|
|
|
case 0x1a:
|
|
|
|
name = "ich9-usb-ehci2";
|
|
|
|
comp = ich9_1a;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2023-03-04 14:40:43 +03:00
|
|
|
ehci = pci_new_multifunction(PCI_DEVFN(slot, 7), name);
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
pci_realize_and_unref(ehci, bus, &error_fatal);
|
2018-12-17 19:32:38 +03:00
|
|
|
usbbus = QLIST_FIRST(&ehci->qdev.child_bus);
|
|
|
|
|
|
|
|
for (i = 0; i < 3; i++) {
|
2023-03-04 14:40:43 +03:00
|
|
|
uhci = pci_new_multifunction(PCI_DEVFN(slot, comp[i].func),
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
comp[i].name);
|
2018-12-17 19:32:38 +03:00
|
|
|
qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);
|
|
|
|
qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);
|
pci: Convert uses of pci_create() etc. with Coccinelle
Replace
dev = pci_create(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = pci_new(type_name);
...
pci_realize_and_unref(dev, bus, &error_fatal);
and similarly for pci_create_multifunction().
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
Coccinelle script:
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
expression d;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
(
d = &dev->qdev;
|
d = DEVICE(dev);
)
... when != dev = expr
- qdev_init_nofail(d);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create(bus, args);
+ dev = pci_new(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = DEVICE(pci_create(bus, args));
+ PCIDevice *pci_dev; // TODO move
+ pci_dev = pci_new(args);
+ dev = DEVICE(pci_dev);
... when != dev = expr
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, expr;
expression list args;
identifier dev;
@@
- PCIDevice *dev = pci_create_multifunction(bus, args);
+ PCIDevice *dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(&dev->qdev);
+ pci_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = pci_create_multifunction(bus, args);
+ dev = pci_new_multifunction(args);
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ pci_realize_and_unref(dev, bus, &error_fatal);
Missing #include "qapi/error.h" added manually, whitespace changes
minimized manually, @pci_dev declarations moved manually.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-16-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
2020-06-10 08:32:04 +03:00
|
|
|
pci_realize_and_unref(uhci, bus, &error_fatal);
|
2018-12-17 19:32:38 +03:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-11-15 00:54:06 +04:00
|
|
|
/* PC hardware initialisation */
|
2014-05-07 18:42:57 +04:00
|
|
|
static void pc_q35_init(MachineState *machine)
|
2012-11-15 00:54:06 +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);
|
2023-06-30 10:37:04 +03:00
|
|
|
Object *phb;
|
2012-11-15 00:54:06 +04:00
|
|
|
PCIDevice *lpc;
|
2016-06-22 15:24:54 +03:00
|
|
|
DeviceState *lpc_dev;
|
2023-02-13 19:20:00 +03:00
|
|
|
MemoryRegion *system_memory = get_system_memory();
|
2016-03-04 19:00:32 +03:00
|
|
|
MemoryRegion *system_io = get_system_io();
|
2024-02-13 07:14:33 +03:00
|
|
|
MemoryRegion *pci_memory = g_new(MemoryRegion, 1);
|
2012-11-15 00:54:06 +04:00
|
|
|
GSIState *gsi_state;
|
|
|
|
ISABus *isa_bus;
|
|
|
|
int i;
|
2014-06-20 05:40:25 +04:00
|
|
|
ram_addr_t lowmem;
|
2014-10-01 22:19:29 +04:00
|
|
|
DriveInfo *hd[MAX_SATA_PORTS];
|
2015-05-28 23:04:10 +03:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2021-07-13 03:42:02 +03:00
|
|
|
bool acpi_pcihp;
|
2021-11-12 14:08:54 +03:00
|
|
|
bool keep_pci_slot_hpc;
|
2022-07-19 20:00:06 +03:00
|
|
|
uint64_t pci_hole64_size = 0;
|
2013-04-29 19:02:50 +04:00
|
|
|
|
2024-02-13 07:14:33 +03:00
|
|
|
assert(pcmc->pci_enabled);
|
|
|
|
|
2013-12-16 15:55:06 +04: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 18:42:57 +04:00
|
|
|
if (machine->ram_size >= 0xb0000000) {
|
2016-01-23 19:02:13 +03:00
|
|
|
lowmem = 0x80000000;
|
2014-06-20 05:40:25 +04:00
|
|
|
} else {
|
|
|
|
lowmem = 0xb0000000;
|
|
|
|
}
|
|
|
|
|
2014-07-07 23:00:41 +04:00
|
|
|
/* Handle the machine opt max-ram-below-4g. It is basically doing
|
2014-06-20 05:40:25 +04:00
|
|
|
* min(qemu limit, user limit).
|
|
|
|
*/
|
2020-05-29 10:39:56 +03:00
|
|
|
if (!pcms->max_ram_below_4g) {
|
|
|
|
pcms->max_ram_below_4g = 4 * GiB;
|
2016-06-24 14:35:17 +03:00
|
|
|
}
|
2020-05-29 10:39:56 +03:00
|
|
|
if (lowmem > pcms->max_ram_below_4g) {
|
|
|
|
lowmem = pcms->max_ram_below_4g;
|
2014-06-20 05:40:25 +04:00
|
|
|
if (machine->ram_size - lowmem > lowmem &&
|
2018-06-29 17:22:13 +03:00
|
|
|
lowmem & (1 * GiB - 1)) {
|
2017-09-11 22:52:43 +03:00
|
|
|
warn_report("There is possibly poor performance as the ram size "
|
|
|
|
" (0x%" PRIx64 ") is more then twice the size of"
|
|
|
|
" max-ram-below-4g (%"PRIu64") and"
|
|
|
|
" max-ram-below-4g is not a multiple of 1G.",
|
2020-05-29 10:39:56 +03:00
|
|
|
(uint64_t)machine->ram_size, pcms->max_ram_below_4g);
|
2014-06-20 05:40:25 +04: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;
|
2012-11-15 00:54:06 +04:00
|
|
|
} else {
|
2019-10-22 10:39:50 +03:00
|
|
|
x86ms->above_4g_mem_size = 0;
|
|
|
|
x86ms->below_4g_mem_size = machine->ram_size;
|
2012-11-15 00:54:06 +04:00
|
|
|
}
|
|
|
|
|
2021-07-19 14:21:23 +03:00
|
|
|
pc_machine_init_sgx_epc(pcms);
|
2019-09-30 18:26:29 +03:00
|
|
|
x86_cpus_init(x86ms, pcmc->default_cpu_version);
|
2014-06-20 05:40:24 +04:00
|
|
|
|
2023-06-20 08:18:12 +03:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvmclock_create(pcmc->kvmclock_create_always);
|
|
|
|
}
|
2014-06-20 05:40:24 +04:00
|
|
|
|
2012-11-15 00:54:06 +04:00
|
|
|
/* create pci host bus */
|
2023-06-30 10:37:04 +03:00
|
|
|
phb = OBJECT(qdev_new(TYPE_Q35_HOST_DEVICE));
|
2012-11-15 00:54:06 +04:00
|
|
|
|
2024-02-13 07:14:33 +03:00
|
|
|
pci_hole64_size = object_property_get_uint(phb,
|
|
|
|
PCI_HOST_PROP_PCI_HOLE64_SIZE,
|
|
|
|
&error_abort);
|
2022-07-19 20:00:06 +03:00
|
|
|
|
2022-07-19 20:00:05 +03:00
|
|
|
/* allocate ram and load rom/bios */
|
2024-02-13 07:14:33 +03:00
|
|
|
memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
|
|
|
|
pc_memory_init(pcms, system_memory, pci_memory, pci_hole64_size);
|
2022-07-19 20:00:05 +03:00
|
|
|
|
2023-06-30 10:37:04 +03:00
|
|
|
object_property_add_child(OBJECT(machine), "q35", phb);
|
2023-06-30 10:37:09 +03:00
|
|
|
object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM,
|
2023-02-13 19:20:01 +03:00
|
|
|
OBJECT(machine->ram), NULL);
|
2023-06-30 10:37:09 +03:00
|
|
|
object_property_set_link(phb, PCI_HOST_PROP_PCI_MEM,
|
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(pci_memory), NULL);
|
2023-06-30 10:37:09 +03:00
|
|
|
object_property_set_link(phb, PCI_HOST_PROP_SYSTEM_MEM,
|
2023-02-13 19:20:00 +03:00
|
|
|
OBJECT(system_memory), NULL);
|
2023-06-30 10:37:09 +03:00
|
|
|
object_property_set_link(phb, PCI_HOST_PROP_IO_MEM,
|
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(system_io), NULL);
|
2023-06-30 10:37:04 +03:00
|
|
|
object_property_set_int(phb, PCI_HOST_BELOW_4G_MEM_SIZE,
|
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
|
|
|
x86ms->below_4g_mem_size, NULL);
|
2023-06-30 10:37:04 +03:00
|
|
|
object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE,
|
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
|
|
|
x86ms->above_4g_mem_size, NULL);
|
2023-06-30 10:37:08 +03:00
|
|
|
object_property_set_bool(phb, PCI_HOST_BYPASS_IOMMU,
|
|
|
|
pcms->default_bus_bypass_iommu, NULL);
|
2024-03-20 11:39:14 +03:00
|
|
|
object_property_set_bool(phb, PCI_HOST_PROP_SMM_RANGES,
|
|
|
|
x86_machine_is_smm_enabled(x86ms), NULL);
|
2023-06-30 10:37:06 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal);
|
2023-06-30 10:37:04 +03:00
|
|
|
|
2012-11-15 00:54:06 +04:00
|
|
|
/* pci */
|
2024-02-24 16:58:48 +03:00
|
|
|
pcms->pcibus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0"));
|
2023-06-30 10:37:06 +03:00
|
|
|
|
2023-10-07 15:38:16 +03:00
|
|
|
/* irq lines */
|
2024-02-13 07:14:33 +03:00
|
|
|
gsi_state = pc_gsi_create(&x86ms->gsi, true);
|
2023-10-07 15:38:16 +03:00
|
|
|
|
2012-11-15 00:54:06 +04:00
|
|
|
/* create ISA bus */
|
2023-03-04 14:40:43 +03:00
|
|
|
lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC),
|
2023-02-13 20:30:27 +03:00
|
|
|
TYPE_ICH9_LPC_DEVICE);
|
2023-10-07 15:38:16 +03:00
|
|
|
lpc_dev = DEVICE(lpc);
|
2024-02-07 16:18:30 +03:00
|
|
|
qdev_prop_set_bit(lpc_dev, "smm-enabled",
|
|
|
|
x86_machine_is_smm_enabled(x86ms));
|
2023-10-07 15:38:16 +03:00
|
|
|
for (i = 0; i < IOAPIC_NUM_PINS; i++) {
|
|
|
|
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, x86ms->gsi[i]);
|
|
|
|
}
|
2024-02-24 16:58:48 +03:00
|
|
|
pci_realize_and_unref(lpc, pcms->pcibus, &error_fatal);
|
2014-06-02 17:25:24 +04:00
|
|
|
|
2024-02-24 16:58:50 +03:00
|
|
|
x86ms->rtc = ISA_DEVICE(object_resolve_path_component(OBJECT(lpc), "rtc"));
|
2023-05-19 11:47:33 +03:00
|
|
|
|
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(lpc), &error_abort);
|
2014-06-02 17:25:24 +04:00
|
|
|
|
2021-07-13 03:42:02 +03:00
|
|
|
acpi_pcihp = object_property_get_bool(OBJECT(lpc),
|
2021-08-16 11:32:14 +03:00
|
|
|
ACPI_PM_PROP_ACPI_PCIHP_BRIDGE,
|
2021-07-13 03:42:02 +03:00
|
|
|
NULL);
|
|
|
|
|
2021-11-12 14:08:54 +03:00
|
|
|
keep_pci_slot_hpc = object_property_get_bool(OBJECT(lpc),
|
|
|
|
"x-keep-pci-slot-hpc",
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
if (!keep_pci_slot_hpc && acpi_pcihp) {
|
2023-01-12 17:02:41 +03:00
|
|
|
object_register_sugar_prop(TYPE_PCIE_SLOT,
|
|
|
|
"x-do-not-expose-native-hotplug-cap",
|
|
|
|
"true", true);
|
2021-07-13 03:42:02 +03:00
|
|
|
}
|
|
|
|
|
2023-02-13 20:30:24 +03:00
|
|
|
isa_bus = ISA_BUS(qdev_get_child_bus(lpc_dev, "isa.0"));
|
2012-11-15 00:54:06 +04:00
|
|
|
|
2022-03-10 15:28:11 +03:00
|
|
|
if (x86ms->pic == ON_OFF_AUTO_ON || x86ms->pic == ON_OFF_AUTO_AUTO) {
|
|
|
|
pc_i8259_create(isa_bus, gsi_state->i8259_irq);
|
|
|
|
}
|
2016-07-14 15:27:17 +03:00
|
|
|
|
2024-02-09 01:03:41 +03:00
|
|
|
ioapic_init_gsi(gsi_state, OBJECT(phb));
|
2012-11-15 00:54:06 +04:00
|
|
|
|
2019-10-16 11:18:10 +03:00
|
|
|
if (tcg_enabled()) {
|
|
|
|
x86_register_ferr_irq(x86ms->gsi[13]);
|
|
|
|
}
|
2012-11-15 00:54:06 +04:00
|
|
|
|
|
|
|
/* init basic PC hardware */
|
2024-02-24 16:58:50 +03:00
|
|
|
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, x86ms->rtc, !mc->no_floppy,
|
2016-11-05 10:19:50 +03:00
|
|
|
0xff0104);
|
2012-11-15 00:54:06 +04:00
|
|
|
|
2018-11-07 18:24:34 +03:00
|
|
|
if (pcms->sata_enabled) {
|
2024-02-13 10:30:00 +03:00
|
|
|
PCIDevice *pdev;
|
2024-02-13 10:31:45 +03:00
|
|
|
AHCIPCIState *ich9;
|
2024-02-13 10:30:00 +03:00
|
|
|
|
2016-11-05 10:19:49 +03:00
|
|
|
/* ahci and SATA device, for q35 1 ahci controller is built-in */
|
2024-02-24 16:58:48 +03:00
|
|
|
pdev = pci_create_simple_multifunction(pcms->pcibus,
|
2016-11-05 10:19:49 +03:00
|
|
|
PCI_DEVFN(ICH9_SATA1_DEV,
|
|
|
|
ICH9_SATA1_FUNC),
|
2023-03-04 14:40:42 +03:00
|
|
|
"ich9-ahci");
|
2024-02-13 10:31:45 +03:00
|
|
|
ich9 = ICH9_AHCI(pdev);
|
2024-02-20 19:06:13 +03:00
|
|
|
pcms->idebus[0] = qdev_get_child_bus(DEVICE(pdev), "ide.0");
|
|
|
|
pcms->idebus[1] = qdev_get_child_bus(DEVICE(pdev), "ide.1");
|
2024-02-13 10:31:45 +03:00
|
|
|
g_assert(MAX_SATA_PORTS == ich9->ahci.ports);
|
|
|
|
ide_drive_get(hd, ich9->ahci.ports);
|
2024-02-13 10:34:27 +03:00
|
|
|
ahci_ide_create_devs(&ich9->ahci, hd);
|
2016-11-05 10:19:49 +03:00
|
|
|
}
|
2012-11-15 00:54:06 +04:00
|
|
|
|
2016-06-08 23:50:25 +03:00
|
|
|
if (machine_usb(machine)) {
|
2012-11-15 00:54:06 +04:00
|
|
|
/* Should we create 6 UHCI according to ich9 spec? */
|
2024-02-24 16:58:48 +03:00
|
|
|
ehci_create_ich9_with_companions(pcms->pcibus, 0x1d);
|
2012-11-15 00:54:06 +04:00
|
|
|
}
|
|
|
|
|
2018-11-07 18:24:34 +03:00
|
|
|
if (pcms->smbus_enabled) {
|
2023-02-13 20:30:26 +03:00
|
|
|
PCIDevice *smb;
|
|
|
|
|
2016-11-05 10:19:48 +03:00
|
|
|
/* TODO: Populate SPD eeprom data. */
|
2024-02-24 16:58:48 +03:00
|
|
|
smb = pci_create_simple_multifunction(pcms->pcibus,
|
2023-02-13 20:30:26 +03:00
|
|
|
PCI_DEVFN(ICH9_SMB_DEV,
|
|
|
|
ICH9_SMB_FUNC),
|
2023-03-04 14:40:42 +03:00
|
|
|
TYPE_ICH9_SMB_DEVICE);
|
2023-02-13 20:30:26 +03:00
|
|
|
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(smb), "i2c"));
|
|
|
|
|
2016-05-13 04:43:45 +03:00
|
|
|
smbus_eeprom_init(pcms->smbus, 8, NULL, 0);
|
2016-11-05 10:19:48 +03:00
|
|
|
}
|
2012-11-15 00:54:06 +04:00
|
|
|
|
|
|
|
/* the rest devices to which pci devfn is automatically assigned */
|
2024-02-24 16:58:48 +03:00
|
|
|
pc_vga_init(isa_bus, pcms->pcibus);
|
|
|
|
pc_nic_init(pcmc, isa_bus, pcms->pcibus);
|
2016-03-04 19:00:32 +03: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
|
|
|
}
|
2012-11-15 00:54:06 +04:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
#define DEFINE_Q35_MACHINE(major, minor) \
|
|
|
|
DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, major, minor);
|
2014-04-24 14:14:53 +04:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
#define DEFINE_Q35_MACHINE_BUGFIX(major, minor, micro) \
|
|
|
|
DEFINE_PC_VER_MACHINE(pc_q35, "pc-q35", pc_q35_init, major, minor, micro);
|
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
|
|
|
|
2015-05-15 20:18:56 +03:00
|
|
|
static void pc_q35_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);
|
2021-03-01 22:59:18 +03:00
|
|
|
pcmc->pci_root_uid = 0;
|
2022-12-12 18:21:45 +03:00
|
|
|
pcmc->default_cpu_version = 1;
|
2018-03-02 12:29:06 +03:00
|
|
|
|
2015-05-15 20:18:54 +03:00
|
|
|
m->family = "pc_q35";
|
|
|
|
m->desc = "Standard PC (Q35 + ICH9, 2009)";
|
|
|
|
m->units_per_default_bus = 1;
|
2015-09-11 23:14:23 +03:00
|
|
|
m->default_machine_opts = "firmware=bios-256k.bin";
|
|
|
|
m->default_display = "std";
|
2023-05-10 21:46:21 +03:00
|
|
|
m->default_nic = "e1000e";
|
2019-05-14 23:14:41 +03:00
|
|
|
m->default_kernel_irqchip_split = false;
|
2015-09-11 23:14:23 +03:00
|
|
|
m->no_floppy = 1;
|
2024-02-28 17:33:51 +03:00
|
|
|
m->max_cpus = 4096;
|
2023-05-10 22:30:45 +03:00
|
|
|
m->no_parallel = !module_object_class_by_name(TYPE_ISA_PARALLEL);
|
2017-11-25 18:16:10 +03:00
|
|
|
machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
|
|
|
|
machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
|
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);
|
2024-03-07 16:43:08 +03:00
|
|
|
compat_props_add(m->compat_props,
|
|
|
|
pc_q35_compat_defaults, pc_q35_compat_defaults_len);
|
2015-05-15 20:18:54 +03:00
|
|
|
}
|
|
|
|
|
2024-09-03 19:22:16 +03:00
|
|
|
static void pc_q35_machine_9_2_options(MachineClass *m)
|
2015-09-11 23:14:25 +03:00
|
|
|
{
|
|
|
|
pc_q35_machine_options(m);
|
|
|
|
m->alias = "q35";
|
2017-09-06 17:26:57 +03:00
|
|
|
}
|
|
|
|
|
2024-09-03 19:22:16 +03:00
|
|
|
DEFINE_Q35_MACHINE(9, 2);
|
|
|
|
|
|
|
|
static void pc_q35_machine_9_1_options(MachineClass *m)
|
|
|
|
{
|
|
|
|
pc_q35_machine_9_2_options(m);
|
|
|
|
m->alias = NULL;
|
|
|
|
compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(9, 1);
|
2024-03-25 17:01:51 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_9_0_options(MachineClass *m)
|
2024-03-25 17:01:51 +03:00
|
|
|
{
|
hw/i386/pc_sysfw: Alias rather than copy isa-bios region
In the -bios case the "isa-bios" memory region is an alias to the BIOS mapped
to the top of the 4G memory boundary. Do the same in the -pflash case, but only
for new machine versions for migration compatibility. This establishes common
behavior and makes pflash commands work in the "isa-bios" region which some
real-world legacy bioses rely on.
Note that in the sev_enabled() case, the "isa-bios" memory region in the -pflash
case will now also point to encrypted memory, just like it already does in the
-bios case.
When running `info mtree` before and after this commit with
`qemu-system-x86_64 -S -drive \
if=pflash,format=raw,readonly=on,file=/usr/share/qemu/bios-256k.bin` and running
`diff -u before.mtree after.mtree` results in the following changes in the
memory tree:
--- before.mtree
+++ after.mtree
@@ -71,7 +71,7 @@
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
00000000000a0000-00000000000bffff (prio 1, i/o): alias smram-region @pci 00000000000a0000-00000000000bffff
00000000000c0000-00000000000c3fff (prio 1, i/o): alias pam-pci @pci 00000000000c0000-00000000000c3fff
00000000000c4000-00000000000c7fff (prio 1, i/o): alias pam-pci @pci 00000000000c4000-00000000000c7fff
@@ -108,7 +108,7 @@
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
00000000000a0000-00000000000bffff (prio 1, i/o): alias smram-region @pci 00000000000a0000-00000000000bffff
00000000000c0000-00000000000c3fff (prio 1, i/o): alias pam-pci @pci 00000000000c0000-00000000000c3fff
00000000000c4000-00000000000c7fff (prio 1, i/o): alias pam-pci @pci 00000000000c4000-00000000000c7fff
@@ -131,11 +131,14 @@
memory-region: pc.ram
0000000000000000-0000000007ffffff (prio 0, ram): pc.ram
+memory-region: system.flash0
+ 00000000fffc0000-00000000ffffffff (prio 0, romd): system.flash0
+
memory-region: pci
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
memory-region: smram
00000000000a0000-00000000000bffff (prio 0, ram): alias smram-low @pc.ram 00000000000a0000-00000000000bffff
Note that in both cases the "system" memory region contains the entry
00000000fffc0000-00000000ffffffff (prio 0, romd): system.flash0
but the "system.flash0" memory region only appears standalone when "isa-bios" is
an alias.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-ID: <20240508175507.22270-7-shentey@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2024-05-08 20:55:07 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_9_1_options(m);
|
smbios: make memory device size configurable per Machine
Currently QEMU describes initial[1] RAM* in SMBIOS as a series of
virtual DIMMs (capped at 16Gb max) using type 17 structure entries.
Which is fine for the most cases. However when starting guest
with terabytes of RAM this leads to too many memory device
structures, which eventually upsets linux kernel as it reserves
only 64K for these entries and when that border is crossed out
it runs out of reserved memory.
Instead of partitioning initial RAM on 16Gb DIMMs, use maximum
possible chunk size that SMBIOS spec allows[2]. Which lets
encode RAM in lower 31 bits of 32bit field (which amounts upto
2047Tb per DIMM).
As result initial RAM will generate only one type 17 structure
until host/guest reach ability to use more RAM in the future.
Compat changes:
We can't unconditionally change chunk size as it will break
QEMU<->guest ABI (and migration). Thus introduce a new machine
class field that would let older versioned machines to use
legacy 16Gb chunks, while new(er) machine type[s] use maximum
possible chunk size.
PS:
While it might seem to be risky to rise max entry size this large
(much beyond of what current physical RAM modules support),
I'd not expect it causing much issues, modulo uncovering bugs
in software running within guest. And those should be fixed
on guest side to handle SMBIOS spec properly, especially if
guest is expected to support so huge RAM configs.
In worst case, QEMU can reduce chunk size later if we would
care enough about introducing a workaround for some 'unfixable'
guest OS, either by fixing up the next machine type or
giving users a CLI option to customize it.
1) Initial RAM - is RAM configured with help '-m SIZE' CLI option/
implicitly defined by machine. It doesn't include memory
configured with help of '-device' option[s] (pcdimm,nvdimm,...)
2) SMBIOS 3.1.0 7.18.5 Memory Device — Extended Size
PS:
* tested on 8Tb host with RHEL6 guest, which seems to parse
type 17 SMBIOS table entries correctly (according to 'dmidecode').
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20240715122417.4059293-1-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2024-07-15 15:24:17 +03:00
|
|
|
m->smbios_memory_device_size = 16 * GiB;
|
2024-03-25 17:01:51 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_9_0, hw_compat_9_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_9_0, pc_compat_9_0_len);
|
hw/i386/pc_sysfw: Alias rather than copy isa-bios region
In the -bios case the "isa-bios" memory region is an alias to the BIOS mapped
to the top of the 4G memory boundary. Do the same in the -pflash case, but only
for new machine versions for migration compatibility. This establishes common
behavior and makes pflash commands work in the "isa-bios" region which some
real-world legacy bioses rely on.
Note that in the sev_enabled() case, the "isa-bios" memory region in the -pflash
case will now also point to encrypted memory, just like it already does in the
-bios case.
When running `info mtree` before and after this commit with
`qemu-system-x86_64 -S -drive \
if=pflash,format=raw,readonly=on,file=/usr/share/qemu/bios-256k.bin` and running
`diff -u before.mtree after.mtree` results in the following changes in the
memory tree:
--- before.mtree
+++ after.mtree
@@ -71,7 +71,7 @@
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
00000000000a0000-00000000000bffff (prio 1, i/o): alias smram-region @pci 00000000000a0000-00000000000bffff
00000000000c0000-00000000000c3fff (prio 1, i/o): alias pam-pci @pci 00000000000c0000-00000000000c3fff
00000000000c4000-00000000000c7fff (prio 1, i/o): alias pam-pci @pci 00000000000c4000-00000000000c7fff
@@ -108,7 +108,7 @@
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
00000000000a0000-00000000000bffff (prio 1, i/o): alias smram-region @pci 00000000000a0000-00000000000bffff
00000000000c0000-00000000000c3fff (prio 1, i/o): alias pam-pci @pci 00000000000c0000-00000000000c3fff
00000000000c4000-00000000000c7fff (prio 1, i/o): alias pam-pci @pci 00000000000c4000-00000000000c7fff
@@ -131,11 +131,14 @@
memory-region: pc.ram
0000000000000000-0000000007ffffff (prio 0, ram): pc.ram
+memory-region: system.flash0
+ 00000000fffc0000-00000000ffffffff (prio 0, romd): system.flash0
+
memory-region: pci
0000000000000000-ffffffffffffffff (prio -1, i/o): pci
00000000000a0000-00000000000bffff (prio 1, i/o): vga-lowmem
00000000000c0000-00000000000dffff (prio 1, rom): pc.rom
- 00000000000e0000-00000000000fffff (prio 1, rom): isa-bios
+ 00000000000e0000-00000000000fffff (prio 1, romd): alias isa-bios @system.flash0 0000000000020000-000000000003ffff
memory-region: smram
00000000000a0000-00000000000bffff (prio 0, ram): alias smram-low @pc.ram 00000000000a0000-00000000000bffff
Note that in both cases the "system" memory region contains the entry
00000000fffc0000-00000000ffffffff (prio 0, romd): system.flash0
but the "system.flash0" memory region only appears standalone when "isa-bios" is
an alias.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-ID: <20240508175507.22270-7-shentey@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2024-05-08 20:55:07 +03:00
|
|
|
pcmc->isa_bios_alias = false;
|
2024-03-25 17:01:51 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(9, 0);
|
2023-11-20 12:42:59 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_8_2_options(MachineClass *m)
|
2023-11-20 12:42:59 +03:00
|
|
|
{
|
2024-03-14 18:23:00 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_9_0_options(m);
|
2024-02-28 17:33:51 +03:00
|
|
|
m->max_cpus = 1024;
|
2023-11-20 12:42:59 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_8_2, hw_compat_8_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_8_2, pc_compat_8_2_len);
|
2024-03-14 18:23:00 +03:00
|
|
|
/* For pc-q35-8.2 and 8.1, use SMBIOS 3.X by default */
|
|
|
|
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_64;
|
2023-11-20 12:42:59 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(8, 2);
|
2023-07-18 17:22:35 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_8_1_options(MachineClass *m)
|
2023-07-18 17:22:35 +03:00
|
|
|
{
|
hw/i386/pc: improve physical address space bound check for 32-bit x86 systems
32-bit x86 systems do not have a reserved memory for hole64. On those 32-bit
systems without PSE36 or PAE CPU features, hotplugging memory devices are not
supported by QEMU as QEMU always places hotplugged memory above 4 GiB boundary
which is beyond the physical address space of the processor. Linux guests also
does not support memory hotplug on those systems. Please see Linux
kernel commit b59d02ed08690 ("mm/memory_hotplug: disable the functionality
for 32b") for more details.
Therefore, the maximum limit of the guest physical address in the absence of
additional memory devices effectively coincides with the end of
"above 4G memory space" region for 32-bit x86 without PAE/PSE36. When users
configure additional memory devices, after properly accounting for the
additional device memory region to find the maximum value of the guest
physical address, the address will be outside the range of the processor's
physical address space.
This change adds improvements to take above into consideration.
For example, previously this was allowed:
$ ./qemu-system-x86_64 -cpu pentium -m size=10G
With this change now it is no longer allowed:
$ ./qemu-system-x86_64 -cpu pentium -m size=10G
qemu-system-x86_64: Address space limit 0xffffffff < 0x2bfffffff phys-bits too low (32)
However, the following are allowed since on both cases physical address
space of the processor is 36 bits:
$ ./qemu-system-x86_64 -cpu pentium2 -m size=10G
$ ./qemu-system-x86_64 -cpu pentium,pse36=on -m size=10G
For 32-bit, without PAE/PSE36, hotplugging additional memory is no longer allowed.
$ ./qemu-system-i386 -m size=1G,maxmem=3G,slots=2
qemu-system-i386: Address space limit 0xffffffff < 0x1ffffffff phys-bits too low (32)
$ ./qemu-system-i386 -machine q35 -m size=1G,maxmem=3G,slots=2
qemu-system-i386: Address space limit 0xffffffff < 0x1ffffffff phys-bits too low (32)
A new compatibility flag is introduced to make sure pc_max_used_gpa() keeps
returning the old value for machines 8.1 and older.
Therefore, the above is still allowed for older machine types in order to support
compatibility. Hence, the following still works:
$ ./qemu-system-i386 -machine pc-i440fx-8.1 -m size=1G,maxmem=3G,slots=2
$ ./qemu-system-i386 -machine pc-q35-8.1 -m size=1G,maxmem=3G,slots=2
Further, following is also allowed as with PSE36, the processor has 36-bit
address space:
$ ./qemu-system-i386 -cpu 486,pse36=on -m size=1G,maxmem=3G,slots=2
After calling CPUID with EAX=0x80000001, all AMD64 compliant processors
have the longmode-capable-bit turned on in the extended feature flags (bit 29)
in EDX. The absence of CPUID longmode can be used to differentiate between
32-bit and 64-bit processors and is the recommended approach. QEMU takes this
approach elsewhere (for example, please see x86_cpu_realizefn()), With
this change, pc_max_used_gpa() also uses the same method to detect 32-bit
processors.
Unit tests are modified to not run 32-bit x86 tests that use memory hotplug.
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230922160413.165702-1-anisinha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2023-09-22 19:04:13 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_8_2_options(m);
|
hw/i386/pc: improve physical address space bound check for 32-bit x86 systems
32-bit x86 systems do not have a reserved memory for hole64. On those 32-bit
systems without PSE36 or PAE CPU features, hotplugging memory devices are not
supported by QEMU as QEMU always places hotplugged memory above 4 GiB boundary
which is beyond the physical address space of the processor. Linux guests also
does not support memory hotplug on those systems. Please see Linux
kernel commit b59d02ed08690 ("mm/memory_hotplug: disable the functionality
for 32b") for more details.
Therefore, the maximum limit of the guest physical address in the absence of
additional memory devices effectively coincides with the end of
"above 4G memory space" region for 32-bit x86 without PAE/PSE36. When users
configure additional memory devices, after properly accounting for the
additional device memory region to find the maximum value of the guest
physical address, the address will be outside the range of the processor's
physical address space.
This change adds improvements to take above into consideration.
For example, previously this was allowed:
$ ./qemu-system-x86_64 -cpu pentium -m size=10G
With this change now it is no longer allowed:
$ ./qemu-system-x86_64 -cpu pentium -m size=10G
qemu-system-x86_64: Address space limit 0xffffffff < 0x2bfffffff phys-bits too low (32)
However, the following are allowed since on both cases physical address
space of the processor is 36 bits:
$ ./qemu-system-x86_64 -cpu pentium2 -m size=10G
$ ./qemu-system-x86_64 -cpu pentium,pse36=on -m size=10G
For 32-bit, without PAE/PSE36, hotplugging additional memory is no longer allowed.
$ ./qemu-system-i386 -m size=1G,maxmem=3G,slots=2
qemu-system-i386: Address space limit 0xffffffff < 0x1ffffffff phys-bits too low (32)
$ ./qemu-system-i386 -machine q35 -m size=1G,maxmem=3G,slots=2
qemu-system-i386: Address space limit 0xffffffff < 0x1ffffffff phys-bits too low (32)
A new compatibility flag is introduced to make sure pc_max_used_gpa() keeps
returning the old value for machines 8.1 and older.
Therefore, the above is still allowed for older machine types in order to support
compatibility. Hence, the following still works:
$ ./qemu-system-i386 -machine pc-i440fx-8.1 -m size=1G,maxmem=3G,slots=2
$ ./qemu-system-i386 -machine pc-q35-8.1 -m size=1G,maxmem=3G,slots=2
Further, following is also allowed as with PSE36, the processor has 36-bit
address space:
$ ./qemu-system-i386 -cpu 486,pse36=on -m size=1G,maxmem=3G,slots=2
After calling CPUID with EAX=0x80000001, all AMD64 compliant processors
have the longmode-capable-bit turned on in the extended feature flags (bit 29)
in EDX. The absence of CPUID longmode can be used to differentiate between
32-bit and 64-bit processors and is the recommended approach. QEMU takes this
approach elsewhere (for example, please see x86_cpu_realizefn()), With
this change, pc_max_used_gpa() also uses the same method to detect 32-bit
processors.
Unit tests are modified to not run 32-bit x86 tests that use memory hotplug.
Suggested-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230922160413.165702-1-anisinha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2023-09-22 19:04:13 +03:00
|
|
|
pcmc->broken_32bit_mem_addr_check = true;
|
2023-07-18 17:22:35 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_8_1, hw_compat_8_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_8_1, pc_compat_8_1_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(8, 1);
|
2023-03-14 20:30:09 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_8_0_options(MachineClass *m)
|
2023-03-14 20:30:09 +03:00
|
|
|
{
|
2023-06-07 23:57:16 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_8_1_options(m);
|
2023-03-14 20:30:09 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_8_0, hw_compat_8_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_8_0, pc_compat_8_0_len);
|
2023-06-07 23:57:16 +03:00
|
|
|
|
|
|
|
/* For pc-q35-8.0 and older, use SMBIOS 2.8 by default */
|
|
|
|
pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32;
|
2023-06-07 23:57:17 +03:00
|
|
|
m->max_cpus = 288;
|
2023-03-14 20:30:09 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(8, 0);
|
2022-12-12 18:21:44 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_7_2_options(MachineClass *m)
|
2022-12-12 18:21:44 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_8_0_options(m);
|
2022-12-12 18:21:44 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_7_2, hw_compat_7_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_7_2, pc_compat_7_2_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(7, 2);
|
2022-07-27 15:17:55 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_7_1_options(MachineClass *m)
|
2022-07-27 15:17:55 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_7_2_options(m);
|
2022-07-27 15:17:55 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(7, 1);
|
2022-03-16 17:55:21 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_7_0_options(MachineClass *m)
|
2022-03-16 17:55:21 +03:00
|
|
|
{
|
2022-07-21 15:56:36 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_7_1_options(m);
|
2022-07-19 20:00:14 +03:00
|
|
|
pcmc->enforce_amd_1tb_hole = false;
|
2022-03-16 17:55:21 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(7, 0);
|
2021-12-17 17:39:48 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_6_2_options(MachineClass *m)
|
2021-12-17 17:39:48 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_7_0_options(m);
|
2021-12-17 17:39:48 +03:00
|
|
|
compat_props_add(m->compat_props, hw_compat_6_2, hw_compat_6_2_len);
|
|
|
|
compat_props_add(m->compat_props, pc_compat_6_2, pc_compat_6_2_len);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(6, 2);
|
2021-08-31 04:54:26 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_6_1_options(MachineClass *m)
|
2021-08-31 04:54:26 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_6_2_options(m);
|
2021-08-31 04:54:26 +03:00
|
|
|
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-09-29 05:58:14 +03:00
|
|
|
m->smp_props.prefer_sockets = true;
|
2021-08-31 04:54:26 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(6, 1);
|
2021-03-31 14:19:00 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_6_0_options(MachineClass *m)
|
2021-03-31 14:19:00 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_6_1_options(m);
|
2021-03-31 14:19:00 +03:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(6, 0);
|
2020-11-09 20:39:28 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_5_2_options(MachineClass *m)
|
2020-11-09 20:39:28 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_6_0_options(m);
|
2020-11-09 20:39:28 +03:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(5, 2);
|
2020-08-19 17:40:16 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_5_1_options(MachineClass *m)
|
2020-08-19 17:40:16 +03:00
|
|
|
{
|
2020-09-22 18:19:34 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_5_2_options(m);
|
2020-08-19 17:40:16 +03:00
|
|
|
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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(5, 1);
|
2020-04-29 17:46:05 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_5_0_options(MachineClass *m)
|
2020-04-29 17:46:05 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_5_1_options(m);
|
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-08-20 12:48:28 +03:00
|
|
|
m->auto_enable_numa_with_memdev = false;
|
2020-04-29 17:46:05 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(5, 0);
|
2019-11-12 13:48:11 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_4_2_options(MachineClass *m)
|
2019-11-12 13:48:11 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_5_0_options(m);
|
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);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(4, 2);
|
2019-07-24 13:35:24 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_4_1_options(MachineClass *m)
|
2019-07-24 13:35:24 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_4_2_options(m);
|
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);
|
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(4, 1);
|
2019-04-11 13:20:25 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_4_0_1_options(MachineClass *m)
|
2019-04-11 13:20:25 +03:00
|
|
|
{
|
2019-06-28 03:28:42 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_4_1_options(m);
|
2019-06-28 03:28:42 +03:00
|
|
|
pcmc->default_cpu_version = CPU_VERSION_LEGACY;
|
2019-06-14 16:09:02 +03:00
|
|
|
/*
|
|
|
|
* This is the default machine for the 4.0-stable branch. It is basically
|
|
|
|
* a 4.0 that doesn't use split irqchip by default. It MUST hence apply the
|
|
|
|
* 4.0 compat props.
|
|
|
|
*/
|
|
|
|
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);
|
2019-05-14 23:14:41 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE_BUGFIX(4, 0, 1);
|
2019-05-14 23:14:41 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_4_0_options(MachineClass *m)
|
2019-05-14 23:14:41 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_4_0_1_options(m);
|
2019-05-14 23:14:41 +03:00
|
|
|
m->default_kernel_irqchip_split = true;
|
2019-06-14 16:09:02 +03:00
|
|
|
/* Compat props are applied by the 4.0.1 machine */
|
2019-04-11 13:20:25 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(4, 0);
|
2018-12-04 19:27:16 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_3_1_options(MachineClass *m)
|
2018-12-04 19:27:16 +03:00
|
|
|
{
|
2019-01-22 15:10:48 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_4_0_options(m);
|
2018-12-20 08:40:35 +03:00
|
|
|
m->default_kernel_irqchip_split = false;
|
2018-11-14 23:41:01 +03:00
|
|
|
m->smbus_no_migration_support = true;
|
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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(3, 1);
|
2018-11-20 16:26:04 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_3_0_options(MachineClass *m)
|
2018-11-20 16:26:04 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_3_1_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(3, 0);
|
2018-05-14 19:41:50 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_12_options(MachineClass *m)
|
2018-05-14 19:41:50 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_3_0_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 12);
|
2017-12-19 06:37:29 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_11_options(MachineClass *m)
|
2017-12-19 06:37:29 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_12_options(m);
|
2023-05-10 21:46:21 +03:00
|
|
|
m->default_nic = "e1000";
|
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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 11);
|
2017-09-06 17:26:57 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_10_options(MachineClass *m)
|
2017-09-06 17:26:57 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_11_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;
|
2015-09-11 23:14:25 +03:00
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 10);
|
2017-04-25 12:49:13 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_9_options(MachineClass *m)
|
2017-04-25 12:49:13 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_10_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 9);
|
2017-01-12 21:24:16 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_8_options(MachineClass *m)
|
2017-01-12 21:24:16 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_9_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 8);
|
2016-09-07 08:21:12 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_7_options(MachineClass *m)
|
2016-09-07 08:21:12 +03:00
|
|
|
{
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_8_options(m);
|
2016-10-19 15:05:43 +03:00
|
|
|
m->max_cpus = 255;
|
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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 7);
|
2016-05-17 17:43:10 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_6_options(MachineClass *m)
|
2016-05-17 17:43:10 +03:00
|
|
|
{
|
2021-10-20 15:48:10 +03:00
|
|
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
|
2016-06-15 12:25:23 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_7_options(m);
|
2016-06-15 12:25:23 +03:00
|
|
|
pcmc->legacy_cpu_hotplug = true;
|
2021-10-20 15:48:10 +03:00
|
|
|
x86mc->fwcfg_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 6);
|
2015-11-30 17:56:36 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_5_options(MachineClass *m)
|
2015-11-30 17:56:36 +03:00
|
|
|
{
|
2019-11-18 14:13:25 +03:00
|
|
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_6_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
|
|
|
}
|
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 5);
|
2015-09-11 23:14:25 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
static void pc_q35_machine_2_4_options(MachineClass *m)
|
2015-05-15 20:18:54 +03:00
|
|
|
{
|
2015-09-07 14:55:32 +03:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
2018-12-12 17:01:23 +03:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
pc_q35_machine_2_5_options(m);
|
2015-10-30 22:36:07 +03:00
|
|
|
m->hw_version = "2.4.0";
|
2015-09-07 14:55:32 +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-05-15 20:18:54 +03:00
|
|
|
}
|
2013-12-02 15:47:29 +04:00
|
|
|
|
2024-06-20 19:57:35 +03:00
|
|
|
DEFINE_Q35_MACHINE(2, 4);
|