pc_q35.c 17.2 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
/*
 * 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.
 */
30

P
Peter Maydell 已提交
31
#include "qemu/osdep.h"
32
#include "qemu/units.h"
33
#include "hw/hw.h"
34
#include "hw/loader.h"
35
#include "sysemu/arch_init.h"
C
Corey Minyard 已提交
36
#include "hw/i2c/smbus_eeprom.h"
37
#include "hw/boards.h"
P
Paolo Bonzini 已提交
38 39
#include "hw/timer/mc146818rtc.h"
#include "hw/xen/xen.h"
40
#include "sysemu/kvm.h"
41
#include "kvm_i386.h"
42
#include "hw/kvm/clock.h"
P
Paolo Bonzini 已提交
43
#include "hw/pci-host/q35.h"
44
#include "exec/address-spaces.h"
45
#include "hw/i386/pc.h"
P
Paolo Bonzini 已提交
46
#include "hw/i386/ich9.h"
47 48
#include "hw/i386/amd_iommu.h"
#include "hw/i386/intel_iommu.h"
49
#include "hw/display/ramfb.h"
50
#include "hw/firmware/smbios.h"
51 52 53
#include "hw/ide/pci.h"
#include "hw/ide/ahci.h"
#include "hw/usb.h"
54
#include "qapi/error.h"
55
#include "qemu/error-report.h"
56
#include "sysemu/numa.h"
57 58 59 60

/* ICH9 AHCI has 6 ports */
#define MAX_SATA_PORTS     6

61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
struct ehci_companions {
    const char *name;
    int func;
    int port;
};

static const struct ehci_companions ich9_1d[] = {
    { .name = "ich9-usb-uhci1", .func = 0, .port = 0 },
    { .name = "ich9-usb-uhci2", .func = 1, .port = 2 },
    { .name = "ich9-usb-uhci3", .func = 2, .port = 4 },
};

static const struct ehci_companions ich9_1a[] = {
    { .name = "ich9-usb-uhci4", .func = 0, .port = 0 },
    { .name = "ich9-usb-uhci5", .func = 1, .port = 2 },
    { .name = "ich9-usb-uhci6", .func = 2, .port = 4 },
};

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;
    }

    ehci = pci_create_multifunction(bus, PCI_DEVFN(slot, 7), true, name);
    qdev_init_nofail(&ehci->qdev);
    usbbus = QLIST_FIRST(&ehci->qdev.child_bus);

    for (i = 0; i < 3; i++) {
        uhci = pci_create_multifunction(bus, PCI_DEVFN(slot, comp[i].func),
                                        true, comp[i].name);
        qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);
        qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);
        qdev_init_nofail(&uhci->qdev);
    }
    return 0;
}

114
/* PC hardware initialisation */
115
static void pc_q35_init(MachineState *machine)
116
{
117
    PCMachineState *pcms = PC_MACHINE(machine);
118
    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
119
    Q35PCIHost *q35_host;
120
    PCIHostState *phb;
121 122
    PCIBus *host_bus;
    PCIDevice *lpc;
123
    DeviceState *lpc_dev;
124 125
    BusState *idebus[MAX_SATA_PORTS];
    ISADevice *rtc_state;
126
    MemoryRegion *system_io = get_system_io();
127 128 129 130 131 132 133 134 135
    MemoryRegion *pci_memory;
    MemoryRegion *rom_memory;
    MemoryRegion *ram_memory;
    GSIState *gsi_state;
    ISABus *isa_bus;
    qemu_irq *i8259;
    int i;
    ICH9LPCState *ich9_lpc;
    PCIDevice *ahci;
136
    ram_addr_t lowmem;
137
    DriveInfo *hd[MAX_SATA_PORTS];
138
    MachineClass *mc = MACHINE_GET_CLASS(machine);
139

140 141 142 143 144 145 146
    /* 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.
     */
147
    if (machine->ram_size >= 0xb0000000) {
148
        lowmem = 0x80000000;
149 150 151 152
    } else {
        lowmem = 0xb0000000;
    }

153
    /* Handle the machine opt max-ram-below-4g.  It is basically doing
154 155
     * min(qemu limit, user limit).
     */
G
Gerd Hoffmann 已提交
156 157 158
    if (!pcms->max_ram_below_4g) {
        pcms->max_ram_below_4g = 1ULL << 32; /* default: 4G */;
    }
159 160
    if (lowmem > pcms->max_ram_below_4g) {
        lowmem = pcms->max_ram_below_4g;
161
        if (machine->ram_size - lowmem > lowmem &&
162
            lowmem & (1 * GiB - 1)) {
163 164 165 166 167
            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.",
                        (uint64_t)machine->ram_size, pcms->max_ram_below_4g);
168 169 170 171
        }
    }

    if (machine->ram_size >= lowmem) {
172 173
        pcms->above_4g_mem_size = machine->ram_size - lowmem;
        pcms->below_4g_mem_size = lowmem;
174
    } else {
175 176
        pcms->above_4g_mem_size = 0;
        pcms->below_4g_mem_size = machine->ram_size;
177 178
    }

179 180
    if (xen_enabled()) {
        xen_hvm_init(pcms, &ram_memory);
181 182
    }

183
    pc_cpus_init(pcms);
184 185 186

    kvmclock_create();

187
    /* pci enabled */
188
    if (pcmc->pci_enabled) {
189
        pci_memory = g_new(MemoryRegion, 1);
P
Paolo Bonzini 已提交
190
        memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
191 192 193 194 195 196
        rom_memory = pci_memory;
    } else {
        pci_memory = NULL;
        rom_memory = get_system_memory();
    }

197
    pc_guest_info_init(pcms);
198

199
    if (pcmc->smbios_defaults) {
200
        /* These values are guest ABI, do not change */
201
        smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
202 203
                            mc->name, pcmc->smbios_legacy_mode,
                            pcmc->smbios_uuid_encoded,
W
Wei Huang 已提交
204
                            SMBIOS_ENTRY_POINT_21);
205 206
    }

207 208
    /* allocate ram and load rom/bios */
    if (!xen_enabled()) {
209
        pc_memory_init(pcms, get_system_memory(),
210
                       rom_memory, &ram_memory);
211 212 213 214
    }

    /* irq lines */
    gsi_state = g_malloc0(sizeof(*gsi_state));
215
    if (kvm_ioapic_in_kernel()) {
216
        kvm_pc_setup_irq_routing(pcmc->pci_enabled);
M
Marc-André Lureau 已提交
217 218
        pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
                                       GSI_NUM_PINS);
219
    } else {
M
Marc-André Lureau 已提交
220
        pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
221 222 223 224 225
    }

    /* create pci host bus */
    q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));

226
    object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL);
227 228 229 230 231 232 233 234 235 236 237 238
    object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory),
                             MCH_HOST_PROP_RAM_MEM, NULL);
    object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory),
                             MCH_HOST_PROP_PCI_MEM, NULL);
    object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()),
                             MCH_HOST_PROP_SYSTEM_MEM, NULL);
    object_property_set_link(OBJECT(q35_host), OBJECT(system_io),
                             MCH_HOST_PROP_IO_MEM, NULL);
    object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size,
                            PCI_HOST_BELOW_4G_MEM_SIZE, NULL);
    object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size,
                            PCI_HOST_ABOVE_4G_MEM_SIZE, NULL);
239 240
    /* pci */
    qdev_init_nofail(DEVICE(q35_host));
241 242
    phb = PCI_HOST_BRIDGE(q35_host);
    host_bus = phb->bus;
243 244 245 246
    /* create ISA bus */
    lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
                                          ICH9_LPC_FUNC), true,
                                          TYPE_ICH9_LPC_DEVICE);
247 248 249

    object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
                             TYPE_HOTPLUG_HANDLER,
250
                             (Object **)&pcms->acpi_dev,
251
                             object_property_allow_set_link,
252
                             OBJ_PROP_LINK_STRONG, &error_abort);
253 254 255
    object_property_set_link(OBJECT(machine), OBJECT(lpc),
                             PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);

256
    ich9_lpc = ICH9_LPC_DEVICE(lpc);
257 258
    lpc_dev = DEVICE(lpc);
    for (i = 0; i < GSI_NUM_PINS; i++) {
M
Marc-André Lureau 已提交
259
        qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, pcms->gsi[i]);
260
    }
261 262
    pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
                 ICH9_LPC_NB_PIRQS);
263
    pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
264 265
    isa_bus = ich9_lpc->isa_bus;

266
    if (kvm_pic_in_kernel()) {
267 268 269 270
        i8259 = kvm_i8259_init(isa_bus);
    } else if (xen_enabled()) {
        i8259 = xen_interrupt_controller_init();
    } else {
271
        i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
272 273 274 275 276
    }

    for (i = 0; i < ISA_NUM_IRQS; i++) {
        gsi_state->i8259_irq[i] = i8259[i];
    }
M
Marc-André Lureau 已提交
277 278
    g_free(i8259);

279
    if (pcmc->pci_enabled) {
280
        ioapic_init_gsi(gsi_state, "q35");
281 282
    }

M
Marc-André Lureau 已提交
283
    pc_register_ferr_irq(pcms->gsi[13]);
284

285
    assert(pcms->vmport != ON_OFF_AUTO__MAX);
286 287
    if (pcms->vmport == ON_OFF_AUTO_AUTO) {
        pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
288 289
    }

290
    /* init basic PC hardware */
M
Marc-André Lureau 已提交
291
    pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy,
292
                         (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
C
Chao Peng 已提交
293
                         0xff0104);
294 295

    /* connect pm stuff to lpc */
296
    ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));
297

298
    if (pcms->sata_enabled) {
C
Chao Peng 已提交
299 300 301 302 303 304 305
        /* ahci and SATA device, for q35 1 ahci controller is built-in */
        ahci = pci_create_simple_multifunction(host_bus,
                                               PCI_DEVFN(ICH9_SATA1_DEV,
                                                         ICH9_SATA1_FUNC),
                                               true, "ich9-ahci");
        idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
        idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
J
John Snow 已提交
306 307
        g_assert(MAX_SATA_PORTS == ahci_get_num_ports(ahci));
        ide_drive_get(hd, ahci_get_num_ports(ahci));
C
Chao Peng 已提交
308 309 310 311
        ahci_ide_create_devs(ahci, hd);
    } else {
        idebus[0] = idebus[1] = NULL;
    }
312

E
Eduardo Habkost 已提交
313
    if (machine_usb(machine)) {
314 315 316 317
        /* Should we create 6 UHCI according to ich9 spec? */
        ehci_create_ich9_with_companions(host_bus, 0x1d);
    }

318
    if (pcms->smbus_enabled) {
C
Chao Peng 已提交
319 320 321 322 323 324
        /* TODO: Populate SPD eeprom data.  */
        smbus_eeprom_init(ich9_smb_init(host_bus,
                                        PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC),
                                        0xb100),
                          8, NULL, 0);
    }
325

326
    pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
327 328 329

    /* the rest devices to which pci devfn is automatically assigned */
    pc_vga_init(isa_bus, host_bus);
330
    pc_nic_init(pcmc, isa_bus, host_bus);
331

332 333
    if (machine->nvdimms_state->is_enabled) {
        nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
334 335
                               pcms->fw_cfg, OBJECT(pcms));
    }
336 337
}

338 339 340 341 342 343 344 345 346 347
#define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
    static void pc_init_##suffix(MachineState *machine) \
    { \
        void (*compat)(MachineState *m) = (compatfn); \
        if (compat) { \
            compat(machine); \
        } \
        pc_q35_init(machine); \
    } \
    DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
M
Michael S. Tsirkin 已提交
348

349

350
static void pc_q35_machine_options(MachineClass *m)
351
{
352 353 354
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
    pcmc->default_nic_model = "e1000e";

355 356 357
    m->family = "pc_q35";
    m->desc = "Standard PC (Q35 + ICH9, 2009)";
    m->units_per_default_bus = 1;
358 359
    m->default_machine_opts = "firmware=bios-256k.bin";
    m->default_display = "std";
360
    m->default_kernel_irqchip_split = true;
361
    m->no_floppy = 1;
362 363
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_AMD_IOMMU_DEVICE);
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_INTEL_IOMMU_DEVICE);
364
    machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE);
I
Igor Mammedov 已提交
365
    m->max_cpus = 288;
366 367
}

368
static void pc_q35_4_0_machine_options(MachineClass *m)
369 370 371
{
    pc_q35_machine_options(m);
    m->alias = "q35";
M
Marcel Apfelbaum 已提交
372 373
}

374 375 376 377 378
DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
                   pc_q35_4_0_machine_options);

static void pc_q35_3_1_machine_options(MachineClass *m)
{
379 380
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

381
    pc_q35_4_0_machine_options(m);
382
    m->default_kernel_irqchip_split = false;
383
    m->smbus_no_migration_support = true;
384
    m->alias = NULL;
385
    pcmc->pvh_enabled = false;
386 387
    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);
388 389
}

390 391 392 393 394 395
DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
                   pc_q35_3_1_machine_options);

static void pc_q35_3_0_machine_options(MachineClass *m)
{
    pc_q35_3_1_machine_options(m);
396 397
    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);
398 399
}

400 401
DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
                    pc_q35_3_0_machine_options);
B
Babu Moger 已提交
402 403 404

static void pc_q35_2_12_machine_options(MachineClass *m)
{
405
    pc_q35_3_0_machine_options(m);
406 407
    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);
B
Babu Moger 已提交
408 409
}

H
Haozhong Zhang 已提交
410 411 412 413 414
DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
                   pc_q35_2_12_machine_options);

static void pc_q35_2_11_machine_options(MachineClass *m)
{
415 416
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

H
Haozhong Zhang 已提交
417
    pc_q35_2_12_machine_options(m);
418
    pcmc->default_nic_model = "e1000";
419 420
    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);
H
Haozhong Zhang 已提交
421 422
}

M
Marcel Apfelbaum 已提交
423 424 425 426 427 428
DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
                   pc_q35_2_11_machine_options);

static void pc_q35_2_10_machine_options(MachineClass *m)
{
    pc_q35_2_11_machine_options(m);
429 430
    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);
431
    m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
432
    m->auto_enable_numa_with_memhp = false;
433 434
}

P
Peter Xu 已提交
435 436 437 438 439 440
DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
                   pc_q35_2_10_machine_options);

static void pc_q35_2_9_machine_options(MachineClass *m)
{
    pc_q35_2_10_machine_options(m);
441 442
    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);
P
Peter Xu 已提交
443 444
}

E
Eduardo Habkost 已提交
445 446 447 448 449 450
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
                   pc_q35_2_9_machine_options);

static void pc_q35_2_8_machine_options(MachineClass *m)
{
    pc_q35_2_9_machine_options(m);
451 452
    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);
E
Eduardo Habkost 已提交
453 454
}

L
Longpeng(Mike) 已提交
455 456 457 458 459 460
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
                   pc_q35_2_8_machine_options);

static void pc_q35_2_7_machine_options(MachineClass *m)
{
    pc_q35_2_8_machine_options(m);
I
Igor Mammedov 已提交
461
    m->max_cpus = 255;
462 463
    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);
L
Longpeng(Mike) 已提交
464 465
}

I
Igor Mammedov 已提交
466 467 468 469 470
DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
                   pc_q35_2_7_machine_options);

static void pc_q35_2_6_machine_options(MachineClass *m)
{
471
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
472

I
Igor Mammedov 已提交
473
    pc_q35_2_7_machine_options(m);
474
    pcmc->legacy_cpu_hotplug = true;
475
    pcmc->linuxboot_dma_enabled = false;
476 477
    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);
I
Igor Mammedov 已提交
478 479
}

E
Eduardo Habkost 已提交
480 481 482 483 484
DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
                   pc_q35_2_6_machine_options);

static void pc_q35_2_5_machine_options(MachineClass *m)
{
485
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
486

E
Eduardo Habkost 已提交
487
    pc_q35_2_6_machine_options(m);
488
    pcmc->save_tsc_khz = false;
G
Gerd Hoffmann 已提交
489
    m->legacy_fw_cfg_order = 1;
490 491
    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);
E
Eduardo Habkost 已提交
492 493
}

494 495 496
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
                   pc_q35_2_5_machine_options);

497
static void pc_q35_2_4_machine_options(MachineClass *m)
498
{
499
    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
500

501
    pc_q35_2_5_machine_options(m);
502
    m->hw_version = "2.4.0";
503
    pcmc->broken_reserved_end = true;
504 505
    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);
506
}
507

508 509
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
                   pc_q35_2_4_machine_options);