2010-05-14 07:29:15 +00:00
|
|
|
/*
|
|
|
|
* QEMU PC System Emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2011-08-15 14:17:38 +00:00
|
|
|
#include <glib.h>
|
|
|
|
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/hw.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/i386/pc.h"
|
|
|
|
#include "hw/i386/apic.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/pci/pci.h"
|
|
|
|
#include "hw/pci/pci_ids.h"
|
|
|
|
#include "hw/usb.h"
|
2012-10-24 06:43:34 +00:00
|
|
|
#include "net/net.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/ide.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/kvm.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/kvm/clock.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-02-04 14:40:22 +00:00
|
|
|
#include "hw/sysbus.h"
|
2013-04-29 15:02:50 +00:00
|
|
|
#include "hw/cpu/icc_bus.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/arch_init.h"
|
|
|
|
#include "sysemu/blockdev.h"
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "hw/i2c/smbus.h"
|
|
|
|
#include "hw/xen/xen.h"
|
2012-12-17 17:19:49 +00:00
|
|
|
#include "exec/memory.h"
|
|
|
|
#include "exec/address-spaces.h"
|
2013-04-15 06:19:22 +00:00
|
|
|
#include "hw/acpi/acpi.h"
|
2012-10-17 22:15:48 +00:00
|
|
|
#include "cpu.h"
|
2010-06-30 11:58:34 +00:00
|
|
|
#ifdef CONFIG_XEN
|
|
|
|
# include <xen/hvm/hvm_info_table.h>
|
|
|
|
#endif
|
2010-05-14 07:29:15 +00:00
|
|
|
|
|
|
|
#define MAX_IDE_BUS 2
|
|
|
|
|
|
|
|
static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
|
|
|
|
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
|
|
|
|
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
|
|
|
|
|
2013-04-26 03:24:46 +00:00
|
|
|
static bool has_pvpanic = true;
|
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
/* PC hardware initialisation */
|
2011-07-26 11:26:18 +00:00
|
|
|
static void pc_init1(MemoryRegion *system_memory,
|
2011-08-08 13:09:04 +00:00
|
|
|
MemoryRegion *system_io,
|
2011-07-26 11:26:18 +00:00
|
|
|
ram_addr_t ram_size,
|
2010-05-14 07:29:15 +00:00
|
|
|
const char *boot_device,
|
|
|
|
const char *kernel_filename,
|
|
|
|
const char *kernel_cmdline,
|
|
|
|
const char *initrd_filename,
|
|
|
|
const char *cpu_model,
|
2011-02-07 11:19:26 +00:00
|
|
|
int pci_enabled,
|
|
|
|
int kvmclock_enabled)
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
ram_addr_t below_4g_mem_size, above_4g_mem_size;
|
|
|
|
PCIBus *pci_bus;
|
2011-12-15 21:09:51 +00:00
|
|
|
ISABus *isa_bus;
|
2010-05-14 07:29:15 +00:00
|
|
|
PCII440FXState *i440fx_state;
|
|
|
|
int piix3_devfn = -1;
|
|
|
|
qemu_irq *cpu_irq;
|
2011-10-07 07:19:35 +00:00
|
|
|
qemu_irq *gsi;
|
2010-05-14 07:29:15 +00:00
|
|
|
qemu_irq *i8259;
|
|
|
|
qemu_irq *smi_irq;
|
2011-10-07 07:19:35 +00:00
|
|
|
GSIState *gsi_state;
|
2010-05-14 07:29:15 +00:00
|
|
|
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
2010-06-24 17:58:20 +00:00
|
|
|
BusState *idebus[MAX_IDE_BUS];
|
2010-05-14 07:29:17 +00:00
|
|
|
ISADevice *rtc_state;
|
2011-10-20 14:37:26 +00:00
|
|
|
ISADevice *floppy;
|
2011-08-15 14:17:38 +00:00
|
|
|
MemoryRegion *ram_memory;
|
|
|
|
MemoryRegion *pci_memory;
|
2011-09-21 18:49:29 +00:00
|
|
|
MemoryRegion *rom_memory;
|
2013-04-29 15:02:50 +00:00
|
|
|
DeviceState *icc_bridge;
|
2013-04-16 00:24:08 +00:00
|
|
|
FWCfgState *fw_cfg = NULL;
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2013-06-25 11:46:37 +00:00
|
|
|
if (xen_enabled() && xen_hvm_init() != 0) {
|
|
|
|
fprintf(stderr, "xen hardware virtual machine initialisation failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2013-04-29 15:02:50 +00:00
|
|
|
icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
|
|
|
|
object_property_add_child(qdev_get_machine(), "icc-bridge",
|
|
|
|
OBJECT(icc_bridge), NULL);
|
|
|
|
|
2013-04-29 16:54:13 +00:00
|
|
|
pc_cpus_init(cpu_model, icc_bridge);
|
2013-04-30 14:00:32 +00:00
|
|
|
pc_acpi_init("acpi-dsdt.aml");
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2013-05-27 16:46:01 +00:00
|
|
|
if (kvm_enabled() && kvmclock_enabled) {
|
2011-02-07 11:19:26 +00:00
|
|
|
kvmclock_create();
|
|
|
|
}
|
|
|
|
|
2013-06-25 11:43:04 +00:00
|
|
|
if (ram_size >= 0xe0000000 ) {
|
|
|
|
above_4g_mem_size = ram_size - 0xe0000000;
|
|
|
|
below_4g_mem_size = 0xe0000000;
|
2011-04-11 18:48:11 +00:00
|
|
|
} else {
|
|
|
|
above_4g_mem_size = 0;
|
|
|
|
below_4g_mem_size = ram_size;
|
|
|
|
}
|
|
|
|
|
2011-09-21 18:49:29 +00:00
|
|
|
if (pci_enabled) {
|
|
|
|
pci_memory = g_new(MemoryRegion, 1);
|
|
|
|
memory_region_init(pci_memory, "pci", INT64_MAX);
|
|
|
|
rom_memory = pci_memory;
|
|
|
|
} else {
|
|
|
|
pci_memory = NULL;
|
|
|
|
rom_memory = system_memory;
|
|
|
|
}
|
2011-08-15 14:17:38 +00:00
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
/* allocate ram and load rom/bios */
|
2010-06-30 11:58:34 +00:00
|
|
|
if (!xen_enabled()) {
|
2012-06-04 11:31:55 +00:00
|
|
|
fw_cfg = pc_memory_init(system_memory,
|
2011-07-26 11:26:16 +00:00
|
|
|
kernel_filename, kernel_cmdline, initrd_filename,
|
2011-08-15 14:17:38 +00:00
|
|
|
below_4g_mem_size, above_4g_mem_size,
|
2012-11-01 16:29:24 +00:00
|
|
|
rom_memory, &ram_memory);
|
2010-06-30 11:58:34 +00:00
|
|
|
}
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2011-10-07 07:19:35 +00:00
|
|
|
gsi_state = g_malloc0(sizeof(*gsi_state));
|
2012-01-31 18:17:52 +00:00
|
|
|
if (kvm_irqchip_in_kernel()) {
|
2012-11-14 20:54:02 +00:00
|
|
|
kvm_pc_setup_irq_routing(pci_enabled);
|
|
|
|
gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
|
2011-10-16 13:30:27 +00:00
|
|
|
GSI_NUM_PINS);
|
|
|
|
} else {
|
|
|
|
gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
|
|
|
|
}
|
2010-05-14 07:29:15 +00:00
|
|
|
|
|
|
|
if (pci_enabled) {
|
2011-12-15 21:09:54 +00:00
|
|
|
pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi,
|
2011-08-15 14:17:38 +00:00
|
|
|
system_memory, system_io, ram_size,
|
|
|
|
below_4g_mem_size,
|
|
|
|
0x100000000ULL - below_4g_mem_size,
|
|
|
|
0x100000000ULL + above_4g_mem_size,
|
2012-10-23 10:30:10 +00:00
|
|
|
(sizeof(hwaddr) == 4
|
2011-08-15 14:17:38 +00:00
|
|
|
? 0
|
|
|
|
: ((uint64_t)1 << 62)),
|
|
|
|
pci_memory, ram_memory);
|
2010-05-14 07:29:15 +00:00
|
|
|
} else {
|
|
|
|
pci_bus = NULL;
|
isapc: fix segfault.
https://bugs.launchpad.net/bugs/611646
reports that ./i386-softmmu/qemu -M isapc segfaults.
This patch fixes the segfault introduced by
f885f1eaa8711c06033ceb1599e3750fb37c306f
It's because i440fx_state in pc_init1() isn't initialized.
> Core was generated by `./i386-softmmu/qemu -M isapc'.
> Program terminated with signal 11, Segmentation fault.
> [New process 19686]
> at qemu/hw/piix_pci.c:136
> (gdb) where
> at qemu/hw/piix_pci.c:136
> boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0,
> kernel_cmdline=0x6469bf "", initrd_filename=0x0,
> cpu_model=0x654d10 "486", pci_enabled=0)
> at qemu/hw/pc_piix.c:178
> boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0,
> kernel_cmdline=0x6469bf "", initrd_filename=0x0, cpu_model=0x654d10 "486")
> at qemu/hw/pc_piix.c:207
> envp=0x7fffe1f5b188)
> at qemu/vl.c:2871
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2010-08-04 08:43:20 +00:00
|
|
|
i440fx_state = NULL;
|
2011-12-15 21:09:51 +00:00
|
|
|
isa_bus = isa_bus_new(NULL, system_io);
|
2011-09-21 18:49:30 +00:00
|
|
|
no_hpet = 1;
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
2011-12-15 21:09:51 +00:00
|
|
|
isa_bus_irqs(isa_bus, gsi);
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2012-01-31 18:17:52 +00:00
|
|
|
if (kvm_irqchip_in_kernel()) {
|
2011-10-16 13:30:27 +00:00
|
|
|
i8259 = kvm_i8259_init(isa_bus);
|
|
|
|
} else if (xen_enabled()) {
|
|
|
|
i8259 = xen_interrupt_controller_init();
|
|
|
|
} else {
|
2011-08-10 22:28:13 +00:00
|
|
|
cpu_irq = pc_allocate_cpu_irq();
|
2011-12-15 21:09:51 +00:00
|
|
|
i8259 = i8259_init(isa_bus, cpu_irq[0]);
|
2011-08-10 22:28:13 +00:00
|
|
|
}
|
|
|
|
|
2011-10-07 07:19:36 +00:00
|
|
|
for (i = 0; i < ISA_NUM_IRQS; i++) {
|
|
|
|
gsi_state->i8259_irq[i] = i8259[i];
|
|
|
|
}
|
2011-08-10 22:28:13 +00:00
|
|
|
if (pci_enabled) {
|
2012-11-14 20:54:01 +00:00
|
|
|
ioapic_init_gsi(gsi_state, "i440fx");
|
2011-08-10 22:28:13 +00:00
|
|
|
}
|
2013-04-29 15:02:50 +00:00
|
|
|
qdev_init_nofail(icc_bridge);
|
2011-08-10 22:28:13 +00:00
|
|
|
|
2011-10-07 07:19:35 +00:00
|
|
|
pc_register_ferr_irq(gsi[13]);
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2012-03-27 16:38:46 +00:00
|
|
|
pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
|
2011-06-16 16:05:17 +00:00
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
/* init basic PC hardware */
|
2011-12-15 21:09:51 +00:00
|
|
|
pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2012-11-14 20:54:01 +00:00
|
|
|
pc_nic_init(isa_bus, pci_bus);
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2011-04-03 11:32:46 +00:00
|
|
|
ide_drive_get(hd, MAX_IDE_BUS);
|
2010-05-14 07:29:15 +00:00
|
|
|
if (pci_enabled) {
|
2010-06-24 17:58:20 +00:00
|
|
|
PCIDevice *dev;
|
2011-07-18 06:07:02 +00:00
|
|
|
if (xen_enabled()) {
|
|
|
|
dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
|
|
|
|
} else {
|
|
|
|
dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
|
|
|
|
}
|
2010-06-24 17:58:20 +00:00
|
|
|
idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
|
|
|
|
idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
|
2010-05-14 07:29:15 +00:00
|
|
|
} else {
|
|
|
|
for(i = 0; i < MAX_IDE_BUS; i++) {
|
2010-06-24 17:58:20 +00:00
|
|
|
ISADevice *dev;
|
2011-12-15 21:09:51 +00:00
|
|
|
dev = isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i],
|
|
|
|
ide_irq[i],
|
2010-06-24 17:58:20 +00:00
|
|
|
hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
|
2013-06-07 11:49:13 +00:00
|
|
|
idebus[i] = qdev_get_child_bus(DEVICE(dev), "ide.0");
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-24 17:58:20 +00:00
|
|
|
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
|
2011-10-20 14:37:26 +00:00
|
|
|
floppy, idebus[0], idebus[1], rtc_state);
|
2010-05-14 07:29:15 +00:00
|
|
|
|
2012-09-02 19:25:28 +00:00
|
|
|
if (pci_enabled && usb_enabled(false)) {
|
2012-03-07 14:06:32 +00:00
|
|
|
pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (pci_enabled && acpi_enabled) {
|
|
|
|
i2c_bus *smbus;
|
|
|
|
|
2013-01-18 14:03:43 +00:00
|
|
|
smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt,
|
|
|
|
x86_env_get_cpu(first_cpu), 1);
|
2010-05-14 07:29:15 +00:00
|
|
|
/* TODO: Populate SPD eeprom data. */
|
|
|
|
smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
|
2012-02-23 12:45:20 +00:00
|
|
|
gsi[9], *smi_irq,
|
2012-06-04 11:31:55 +00:00
|
|
|
kvm_enabled(), fw_cfg);
|
2011-04-05 02:07:06 +00:00
|
|
|
smbus_eeprom_init(smbus, 8, NULL, 0);
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (pci_enabled) {
|
|
|
|
pc_pci_device_init(pci_bus);
|
|
|
|
}
|
2013-04-26 03:24:46 +00:00
|
|
|
|
|
|
|
if (has_pvpanic) {
|
|
|
|
pvpanic_init(isa_bus);
|
|
|
|
}
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
2012-10-15 20:22:02 +00:00
|
|
|
static void pc_init_pci(QEMUMachineInitArgs *args)
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
2012-10-15 20:22:02 +00:00
|
|
|
ram_addr_t ram_size = args->ram_size;
|
|
|
|
const char *cpu_model = args->cpu_model;
|
|
|
|
const char *kernel_filename = args->kernel_filename;
|
|
|
|
const char *kernel_cmdline = args->kernel_cmdline;
|
|
|
|
const char *initrd_filename = args->initrd_filename;
|
|
|
|
const char *boot_device = args->boot_device;
|
2011-07-26 11:26:18 +00:00
|
|
|
pc_init1(get_system_memory(),
|
2011-08-08 13:09:04 +00:00
|
|
|
get_system_io(),
|
2011-07-26 11:26:18 +00:00
|
|
|
ram_size, boot_device,
|
2010-05-14 07:29:15 +00:00
|
|
|
kernel_filename, kernel_cmdline,
|
2011-02-07 11:19:26 +00:00
|
|
|
initrd_filename, cpu_model, 1, 1);
|
|
|
|
}
|
|
|
|
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
|
|
|
|
{
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2013-04-25 18:43:04 +00:00
|
|
|
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
pc_init_pci(args);
|
|
|
|
}
|
|
|
|
|
2013-01-22 20:25:09 +00:00
|
|
|
static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
enable_compat_apic_id_mode();
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2013-01-22 20:25:09 +00:00
|
|
|
pc_init_pci(args);
|
|
|
|
}
|
|
|
|
|
2013-04-12 15:25:02 +00:00
|
|
|
/* PC machine init function for pc-1.1 to pc-1.2 */
|
2013-01-17 20:59:29 +00:00
|
|
|
static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
|
2012-10-17 22:15:48 +00:00
|
|
|
{
|
2013-01-17 20:59:29 +00:00
|
|
|
disable_kvm_pv_eoi();
|
2013-04-12 15:25:01 +00:00
|
|
|
enable_compat_apic_id_mode();
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2013-04-12 15:25:01 +00:00
|
|
|
pc_init_pci(args);
|
2012-10-17 22:15:48 +00:00
|
|
|
}
|
|
|
|
|
2013-04-12 15:25:02 +00:00
|
|
|
/* PC machine init function for pc-0.14 to pc-1.0 */
|
|
|
|
static void pc_init_pci_1_0(QEMUMachineInitArgs *args)
|
|
|
|
{
|
|
|
|
disable_kvm_pv_eoi();
|
|
|
|
enable_compat_apic_id_mode();
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2013-04-12 15:25:02 +00:00
|
|
|
pc_init_pci(args);
|
|
|
|
}
|
|
|
|
|
2013-01-17 20:59:29 +00:00
|
|
|
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
|
2012-10-15 20:22:02 +00:00
|
|
|
static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
|
2011-02-07 11:19:26 +00:00
|
|
|
{
|
2012-10-15 20:22:02 +00:00
|
|
|
ram_addr_t ram_size = args->ram_size;
|
|
|
|
const char *cpu_model = args->cpu_model;
|
|
|
|
const char *kernel_filename = args->kernel_filename;
|
|
|
|
const char *kernel_cmdline = args->kernel_cmdline;
|
|
|
|
const char *initrd_filename = args->initrd_filename;
|
|
|
|
const char *boot_device = args->boot_device;
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2013-01-17 20:59:29 +00:00
|
|
|
disable_kvm_pv_eoi();
|
2013-01-22 20:25:09 +00:00
|
|
|
enable_compat_apic_id_mode();
|
2011-07-26 11:26:18 +00:00
|
|
|
pc_init1(get_system_memory(),
|
2011-08-08 13:09:04 +00:00
|
|
|
get_system_io(),
|
2011-07-26 11:26:18 +00:00
|
|
|
ram_size, boot_device,
|
2011-02-07 11:19:26 +00:00
|
|
|
kernel_filename, kernel_cmdline,
|
|
|
|
initrd_filename, cpu_model, 1, 0);
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
2012-10-15 20:22:02 +00:00
|
|
|
static void pc_init_isa(QEMUMachineInitArgs *args)
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
2012-10-15 20:22:02 +00:00
|
|
|
ram_addr_t ram_size = args->ram_size;
|
|
|
|
const char *cpu_model = args->cpu_model;
|
|
|
|
const char *kernel_filename = args->kernel_filename;
|
|
|
|
const char *kernel_cmdline = args->kernel_cmdline;
|
|
|
|
const char *initrd_filename = args->initrd_filename;
|
|
|
|
const char *boot_device = args->boot_device;
|
2013-04-26 03:24:46 +00:00
|
|
|
has_pvpanic = false;
|
2010-05-14 07:29:15 +00:00
|
|
|
if (cpu_model == NULL)
|
|
|
|
cpu_model = "486";
|
2013-01-17 20:59:29 +00:00
|
|
|
disable_kvm_pv_eoi();
|
2013-01-22 20:25:09 +00:00
|
|
|
enable_compat_apic_id_mode();
|
2011-07-26 11:26:18 +00:00
|
|
|
pc_init1(get_system_memory(),
|
2011-08-08 13:09:04 +00:00
|
|
|
get_system_io(),
|
2011-07-26 11:26:18 +00:00
|
|
|
ram_size, boot_device,
|
2010-05-14 07:29:15 +00:00
|
|
|
kernel_filename, kernel_cmdline,
|
2011-02-07 11:19:26 +00:00
|
|
|
initrd_filename, cpu_model, 0, 1);
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
2010-06-30 11:58:34 +00:00
|
|
|
#ifdef CONFIG_XEN
|
2012-10-15 20:22:02 +00:00
|
|
|
static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
|
2010-06-30 11:58:34 +00:00
|
|
|
{
|
2013-06-25 11:46:44 +00:00
|
|
|
PCIBus *bus;
|
|
|
|
|
2013-05-27 16:46:01 +00:00
|
|
|
pc_init_pci(args);
|
2013-06-25 11:46:44 +00:00
|
|
|
|
|
|
|
bus = pci_find_root_bus(0);
|
|
|
|
if (bus != NULL) {
|
|
|
|
pci_create_simple(bus, -1, "xen-platform");
|
|
|
|
}
|
2010-06-30 11:58:34 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-05-27 20:23:53 +00:00
|
|
|
static QEMUMachine pc_i440fx_machine_v1_6 = {
|
|
|
|
.name = "pc-i440fx-1.6",
|
2010-05-14 07:29:15 +00:00
|
|
|
.alias = "pc",
|
2013-01-08 07:53:13 +00:00
|
|
|
.desc = "Standard PC (i440FX + PIIX, 1996)",
|
2013-01-17 20:59:29 +00:00
|
|
|
.init = pc_init_pci,
|
2013-04-30 16:00:53 +00:00
|
|
|
.hot_add_cpu = pc_hot_add_cpu,
|
2010-05-14 07:29:15 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.is_default = 1,
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-05-14 07:29:15 +00:00
|
|
|
};
|
|
|
|
|
2013-05-27 20:23:53 +00:00
|
|
|
static QEMUMachine pc_i440fx_machine_v1_5 = {
|
|
|
|
.name = "pc-i440fx-1.5",
|
|
|
|
.desc = "Standard PC (i440FX + PIIX, 1996)",
|
|
|
|
.init = pc_init_pci,
|
|
|
|
.hot_add_cpu = pc_hot_add_cpu,
|
|
|
|
.max_cpus = 255,
|
2013-05-27 20:23:54 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_5,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2013-05-27 20:23:53 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
|
|
|
};
|
|
|
|
|
2013-02-08 13:06:15 +00:00
|
|
|
static QEMUMachine pc_i440fx_machine_v1_4 = {
|
|
|
|
.name = "pc-i440fx-1.4",
|
|
|
|
.desc = "Standard PC (i440FX + PIIX, 1996)",
|
pc: Kill the "use flash device for BIOS unless KVM" misfeature
Use of a flash memory device for the BIOS was added in series "[PATCH
v10 0/8] PC system flash support", commit 4732dca..1b89faf, v1.1.
Flash vs. ROM is a guest-visible difference. Thus, flash use had to
be suppressed for machine types pc-1.0 and older. This was
accomplished by adding a dummy device "pc-sysfw" with property
"rom_only":
* Non-zero rom_only means "use ROM". Default for pc-1.0 and older.
* Zero rom_only means "maybe use flash". Default for newer machines.
Not only is the dummy device ugly, it was also retroactively added to
the older machine types! Fortunately, it's not guest-visible (thus no
immediate guest ABI breakage), and has no vmstate (thus no immediate
migration breakage). Breakage occurs only if the user unwisely
enables flash by setting rom_only to zero. Patch review FAIL #1.
Why "maybe use flash"? Flash didn't (and still doesn't) work with
KVM. Therefore, rom_only=0 really means "use flash, except when KVM
is enabled, use ROM". This is a Bad Idea, because it makes enabling/
disabling KVM guest-visible. Patch review FAIL #2.
Aside: it also precludes migrating between KVM on and off, but that's
not possible for other reasons anyway.
Fix as follows:
1. Change the meaning of rom_only=0 to mean "use flash, no ifs, buts,
or maybes" for pc-i440fx-1.5 and pc-q35-1.5. Don't change anything
for older machines (to remain bug-compatible).
2. Change the default value from 0 to 1 for these machines.
Necessary, because 0 doesn't work with KVM. Once it does, we can flip
the default back to 0.
3. Don't revert the retroactive addition of device "pc-sysfw" to older
machine types. Seems not worth the trouble.
4. Add a TODO comment asking for device "pc-sysfw" to be dropped once
flash works with KVM.
Net effect is that you get a BIOS ROM again even when KVM is disabled,
just like for machines predating the introduction of flash.
To get flash instead, use "--global pc-sysfw.rom_only=0".
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1365780303-26398-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-12 15:25:03 +00:00
|
|
|
.init = pc_init_pci_1_4,
|
2013-02-08 13:06:15 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_4,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
|
|
|
};
|
|
|
|
|
2012-11-17 11:47:18 +00:00
|
|
|
#define PC_COMPAT_1_3 \
|
2013-02-08 13:06:15 +00:00
|
|
|
PC_COMPAT_1_4, \
|
2012-11-17 11:47:18 +00:00
|
|
|
{\
|
|
|
|
.driver = "usb-tablet",\
|
|
|
|
.property = "usb_version",\
|
|
|
|
.value = stringify(1),\
|
2013-01-22 15:44:45 +00:00
|
|
|
},{\
|
|
|
|
.driver = "virtio-net-pci",\
|
|
|
|
.property = "ctrl_mac_addr",\
|
|
|
|
.value = "off", \
|
2013-01-30 11:12:41 +00:00
|
|
|
},{ \
|
|
|
|
.driver = "virtio-net-pci", \
|
|
|
|
.property = "mq", \
|
|
|
|
.value = "off", \
|
2013-02-14 17:11:27 +00:00
|
|
|
}, {\
|
|
|
|
.driver = "e1000",\
|
|
|
|
.property = "autonegotiation",\
|
|
|
|
.value = "off",\
|
2012-11-17 11:47:18 +00:00
|
|
|
}
|
|
|
|
|
2012-12-04 13:39:16 +00:00
|
|
|
static QEMUMachine pc_machine_v1_3 = {
|
|
|
|
.name = "pc-1.3",
|
|
|
|
.desc = "Standard PC",
|
2013-01-22 20:25:09 +00:00
|
|
|
.init = pc_init_pci_1_3,
|
2012-12-04 13:39:16 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-11-17 11:47:18 +00:00
|
|
|
PC_COMPAT_1_3,
|
2012-12-04 13:39:16 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2012-12-04 13:39:16 +00:00
|
|
|
};
|
|
|
|
|
2012-09-13 09:08:01 +00:00
|
|
|
#define PC_COMPAT_1_2 \
|
2012-11-17 11:47:18 +00:00
|
|
|
PC_COMPAT_1_3,\
|
2012-09-13 09:08:01 +00:00
|
|
|
{\
|
|
|
|
.driver = "nec-usb-xhci",\
|
|
|
|
.property = "msi",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "nec-usb-xhci",\
|
|
|
|
.property = "msix",\
|
|
|
|
.value = "off",\
|
2012-09-13 09:08:02 +00:00
|
|
|
},{\
|
|
|
|
.driver = "ivshmem",\
|
|
|
|
.property = "use64",\
|
|
|
|
.value = "0",\
|
2012-10-08 08:05:22 +00:00
|
|
|
},{\
|
|
|
|
.driver = "qxl",\
|
|
|
|
.property = "revision",\
|
|
|
|
.value = stringify(3),\
|
|
|
|
},{\
|
|
|
|
.driver = "qxl-vga",\
|
|
|
|
.property = "revision",\
|
|
|
|
.value = stringify(3),\
|
2012-10-15 06:02:55 +00:00
|
|
|
},{\
|
|
|
|
.driver = "VGA",\
|
|
|
|
.property = "mmio",\
|
|
|
|
.value = "off",\
|
2012-09-13 09:08:01 +00:00
|
|
|
}
|
|
|
|
|
2012-09-13 09:08:00 +00:00
|
|
|
static QEMUMachine pc_machine_v1_2 = {
|
|
|
|
.name = "pc-1.2",
|
|
|
|
.desc = "Standard PC",
|
2013-01-17 20:59:29 +00:00
|
|
|
.init = pc_init_pci_1_2,
|
2012-09-13 09:08:00 +00:00
|
|
|
.max_cpus = 255,
|
2012-09-13 09:08:01 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_2,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2012-09-13 09:08:00 +00:00
|
|
|
};
|
|
|
|
|
2012-06-11 08:42:53 +00:00
|
|
|
#define PC_COMPAT_1_1 \
|
2012-09-13 09:08:01 +00:00
|
|
|
PC_COMPAT_1_2,\
|
2012-06-11 08:42:53 +00:00
|
|
|
{\
|
2012-08-20 13:23:28 +00:00
|
|
|
.driver = "virtio-scsi-pci",\
|
|
|
|
.property = "hotplug",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-scsi-pci",\
|
|
|
|
.property = "param_change",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
2012-06-11 08:42:53 +00:00
|
|
|
.driver = "VGA",\
|
|
|
|
.property = "vgamem_mb",\
|
|
|
|
.value = stringify(8),\
|
|
|
|
},{\
|
|
|
|
.driver = "vmware-svga",\
|
|
|
|
.property = "vgamem_mb",\
|
|
|
|
.value = stringify(8),\
|
|
|
|
},{\
|
|
|
|
.driver = "qxl-vga",\
|
|
|
|
.property = "vgamem_mb",\
|
|
|
|
.value = stringify(8),\
|
|
|
|
},{\
|
|
|
|
.driver = "qxl",\
|
|
|
|
.property = "vgamem_mb",\
|
|
|
|
.value = stringify(8),\
|
2012-08-21 13:40:49 +00:00
|
|
|
},{\
|
|
|
|
.driver = "virtio-blk-pci",\
|
|
|
|
.property = "config-wce",\
|
|
|
|
.value = "off",\
|
2012-06-11 08:42:53 +00:00
|
|
|
}
|
|
|
|
|
2012-06-11 08:38:22 +00:00
|
|
|
static QEMUMachine pc_machine_v1_1 = {
|
|
|
|
.name = "pc-1.1",
|
|
|
|
.desc = "Standard PC",
|
2013-01-17 20:59:29 +00:00
|
|
|
.init = pc_init_pci_1_2,
|
2012-06-11 08:38:22 +00:00
|
|
|
.max_cpus = 255,
|
2012-06-11 08:42:53 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
PC_COMPAT_1_1,
|
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2012-06-11 08:38:22 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_1_0 \
|
2012-06-11 08:42:53 +00:00
|
|
|
PC_COMPAT_1_1,\
|
2012-03-26 09:26:16 +00:00
|
|
|
{\
|
|
|
|
.driver = "pc-sysfw",\
|
|
|
|
.property = "rom_only",\
|
|
|
|
.value = stringify(1),\
|
|
|
|
}, {\
|
2013-04-27 20:18:38 +00:00
|
|
|
.driver = TYPE_ISA_FDC,\
|
2012-03-26 09:26:16 +00:00
|
|
|
.property = "check_media_rate",\
|
|
|
|
.value = "off",\
|
2012-04-03 14:24:11 +00:00
|
|
|
}, {\
|
|
|
|
.driver = "virtio-balloon-pci",\
|
|
|
|
.property = "class",\
|
|
|
|
.value = stringify(PCI_CLASS_MEMORY_RAM),\
|
2012-04-16 17:56:28 +00:00
|
|
|
},{\
|
|
|
|
.driver = "apic",\
|
|
|
|
.property = "vapic",\
|
|
|
|
.value = "off",\
|
2011-08-22 07:09:51 +00:00
|
|
|
},{\
|
2012-03-28 16:12:47 +00:00
|
|
|
.driver = TYPE_USB_DEVICE,\
|
2011-08-22 07:09:51 +00:00
|
|
|
.property = "full-path",\
|
|
|
|
.value = "no",\
|
2012-03-26 09:26:16 +00:00
|
|
|
}
|
|
|
|
|
2012-02-22 07:18:55 +00:00
|
|
|
static QEMUMachine pc_machine_v1_0 = {
|
|
|
|
.name = "pc-1.0",
|
|
|
|
.desc = "Standard PC",
|
2013-04-12 15:25:02 +00:00
|
|
|
.init = pc_init_pci_1_0,
|
2012-02-22 07:18:55 +00:00
|
|
|
.max_cpus = 255,
|
2012-02-22 07:18:56 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_1_0,
|
2012-02-22 07:18:56 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-05-30 03:35:51 +00:00
|
|
|
.hw_version = "1.0",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2012-02-22 07:18:55 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_0_15 \
|
|
|
|
PC_COMPAT_1_0
|
|
|
|
|
2011-12-18 18:59:12 +00:00
|
|
|
static QEMUMachine pc_machine_v0_15 = {
|
|
|
|
.name = "pc-0.15",
|
|
|
|
.desc = "Standard PC",
|
2013-04-12 15:25:02 +00:00
|
|
|
.init = pc_init_pci_1_0,
|
2011-12-18 18:59:12 +00:00
|
|
|
.max_cpus = 255,
|
2012-02-22 07:18:56 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_15,
|
2012-02-22 07:18:56 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-05-30 03:35:51 +00:00
|
|
|
.hw_version = "0.15",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2011-12-18 18:59:12 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_0_14 \
|
|
|
|
PC_COMPAT_0_15,\
|
|
|
|
{\
|
|
|
|
.driver = "virtio-blk-pci",\
|
|
|
|
.property = "event_idx",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-serial-pci",\
|
|
|
|
.property = "event_idx",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-net-pci",\
|
|
|
|
.property = "event_idx",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-balloon-pci",\
|
|
|
|
.property = "event_idx",\
|
|
|
|
.value = "off",\
|
|
|
|
}
|
|
|
|
|
2011-11-07 15:33:08 +00:00
|
|
|
static QEMUMachine pc_machine_v0_14 = {
|
|
|
|
.name = "pc-0.14",
|
|
|
|
.desc = "Standard PC",
|
2013-04-12 15:25:02 +00:00
|
|
|
.init = pc_init_pci_1_0,
|
2011-11-07 15:33:08 +00:00
|
|
|
.max_cpus = 255,
|
2011-11-13 13:27:51 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_14,
|
2011-11-13 13:27:51 +00:00
|
|
|
{
|
|
|
|
.driver = "qxl",
|
|
|
|
.property = "revision",
|
|
|
|
.value = stringify(2),
|
|
|
|
},{
|
|
|
|
.driver = "qxl-vga",
|
|
|
|
.property = "revision",
|
|
|
|
.value = stringify(2),
|
2012-02-22 07:18:56 +00:00
|
|
|
},
|
2011-11-13 13:27:51 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-05-30 03:35:51 +00:00
|
|
|
.hw_version = "0.14",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2011-11-07 15:33:08 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_0_13 \
|
|
|
|
PC_COMPAT_0_14,\
|
|
|
|
{\
|
2012-03-28 16:12:47 +00:00
|
|
|
.driver = TYPE_PCI_DEVICE,\
|
2012-03-26 09:26:16 +00:00
|
|
|
.property = "command_serr_enable",\
|
|
|
|
.value = "off",\
|
|
|
|
},{\
|
|
|
|
.driver = "AC97",\
|
|
|
|
.property = "use_broken_id",\
|
|
|
|
.value = stringify(1),\
|
|
|
|
}
|
|
|
|
|
2010-11-11 11:59:25 +00:00
|
|
|
static QEMUMachine pc_machine_v0_13 = {
|
|
|
|
.name = "pc-0.13",
|
|
|
|
.desc = "Standard PC",
|
2011-02-07 11:19:26 +00:00
|
|
|
.init = pc_init_pci_no_kvmclock,
|
2010-11-11 11:59:25 +00:00
|
|
|
.max_cpus = 255,
|
2010-11-11 11:59:26 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_13,
|
2010-11-11 11:59:26 +00:00
|
|
|
{
|
|
|
|
.driver = "virtio-9p-pci",
|
|
|
|
.property = "vectors",
|
|
|
|
.value = stringify(0),
|
2010-11-17 11:06:44 +00:00
|
|
|
},{
|
|
|
|
.driver = "VGA",
|
|
|
|
.property = "rombar",
|
|
|
|
.value = stringify(0),
|
|
|
|
},{
|
|
|
|
.driver = "vmware-svga",
|
|
|
|
.property = "rombar",
|
|
|
|
.value = stringify(0),
|
2012-02-22 07:18:56 +00:00
|
|
|
},
|
2010-11-11 11:59:26 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-05-30 03:35:51 +00:00
|
|
|
.hw_version = "0.13",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-11-11 11:59:25 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_0_12 \
|
|
|
|
PC_COMPAT_0_13,\
|
|
|
|
{\
|
|
|
|
.driver = "virtio-serial-pci",\
|
|
|
|
.property = "max_ports",\
|
|
|
|
.value = stringify(1),\
|
|
|
|
},{\
|
|
|
|
.driver = "virtio-serial-pci",\
|
|
|
|
.property = "vectors",\
|
|
|
|
.value = stringify(0),\
|
2013-06-12 11:08:45 +00:00
|
|
|
},{\
|
|
|
|
.driver = "usb-mouse",\
|
|
|
|
.property = "serial",\
|
|
|
|
.value = "1",\
|
|
|
|
},{\
|
|
|
|
.driver = "usb-tablet",\
|
|
|
|
.property = "serial",\
|
|
|
|
.value = "1",\
|
|
|
|
},{\
|
|
|
|
.driver = "usb-kbd",\
|
|
|
|
.property = "serial",\
|
|
|
|
.value = "1",\
|
2012-03-26 09:26:16 +00:00
|
|
|
}
|
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
static QEMUMachine pc_machine_v0_12 = {
|
|
|
|
.name = "pc-0.12",
|
|
|
|
.desc = "Standard PC",
|
2011-02-07 11:19:26 +00:00
|
|
|
.init = pc_init_pci_no_kvmclock,
|
2010-05-14 07:29:15 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_12,
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
2010-11-17 11:06:44 +00:00
|
|
|
.driver = "VGA",
|
|
|
|
.property = "rombar",
|
|
|
|
.value = stringify(0),
|
|
|
|
},{
|
|
|
|
.driver = "vmware-svga",
|
|
|
|
.property = "rombar",
|
|
|
|
.value = stringify(0),
|
2012-02-22 07:18:56 +00:00
|
|
|
},
|
2010-05-14 07:29:15 +00:00
|
|
|
{ /* end of list */ }
|
2012-05-30 03:35:51 +00:00
|
|
|
},
|
|
|
|
.hw_version = "0.12",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-05-14 07:29:15 +00:00
|
|
|
};
|
|
|
|
|
2012-03-26 09:26:16 +00:00
|
|
|
#define PC_COMPAT_0_11 \
|
|
|
|
PC_COMPAT_0_12,\
|
|
|
|
{\
|
|
|
|
.driver = "virtio-blk-pci",\
|
|
|
|
.property = "vectors",\
|
|
|
|
.value = stringify(0),\
|
2012-05-02 11:31:04 +00:00
|
|
|
},{\
|
2012-03-28 16:12:47 +00:00
|
|
|
.driver = TYPE_PCI_DEVICE,\
|
2012-05-02 11:31:04 +00:00
|
|
|
.property = "rombar",\
|
|
|
|
.value = stringify(0),\
|
2012-03-26 09:26:16 +00:00
|
|
|
}
|
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
static QEMUMachine pc_machine_v0_11 = {
|
|
|
|
.name = "pc-0.11",
|
|
|
|
.desc = "Standard PC, qemu 0.11",
|
2011-02-07 11:19:26 +00:00
|
|
|
.init = pc_init_pci_no_kvmclock,
|
2010-05-14 07:29:15 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_11,
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
|
|
|
.driver = "ide-drive",
|
|
|
|
.property = "ver",
|
|
|
|
.value = "0.11",
|
|
|
|
},{
|
|
|
|
.driver = "scsi-disk",
|
|
|
|
.property = "ver",
|
|
|
|
.value = "0.11",
|
2012-02-22 07:18:56 +00:00
|
|
|
},
|
2010-05-14 07:29:15 +00:00
|
|
|
{ /* end of list */ }
|
2012-05-30 03:35:51 +00:00
|
|
|
},
|
|
|
|
.hw_version = "0.11",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-05-14 07:29:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static QEMUMachine pc_machine_v0_10 = {
|
|
|
|
.name = "pc-0.10",
|
|
|
|
.desc = "Standard PC, qemu 0.10",
|
2011-02-07 11:19:26 +00:00
|
|
|
.init = pc_init_pci_no_kvmclock,
|
2010-05-14 07:29:15 +00:00
|
|
|
.max_cpus = 255,
|
|
|
|
.compat_props = (GlobalProperty[]) {
|
2012-03-26 09:26:16 +00:00
|
|
|
PC_COMPAT_0_11,
|
2010-05-14 07:29:15 +00:00
|
|
|
{
|
|
|
|
.driver = "virtio-blk-pci",
|
|
|
|
.property = "class",
|
|
|
|
.value = stringify(PCI_CLASS_STORAGE_OTHER),
|
|
|
|
},{
|
|
|
|
.driver = "virtio-serial-pci",
|
|
|
|
.property = "class",
|
|
|
|
.value = stringify(PCI_CLASS_DISPLAY_OTHER),
|
|
|
|
},{
|
|
|
|
.driver = "virtio-net-pci",
|
|
|
|
.property = "vectors",
|
|
|
|
.value = stringify(0),
|
|
|
|
},{
|
|
|
|
.driver = "ide-drive",
|
|
|
|
.property = "ver",
|
|
|
|
.value = "0.10",
|
|
|
|
},{
|
|
|
|
.driver = "scsi-disk",
|
|
|
|
.property = "ver",
|
|
|
|
.value = "0.10",
|
2012-02-22 07:18:56 +00:00
|
|
|
},
|
2010-05-14 07:29:15 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2012-05-30 03:35:51 +00:00
|
|
|
.hw_version = "0.10",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-05-14 07:29:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static QEMUMachine isapc_machine = {
|
|
|
|
.name = "isapc",
|
|
|
|
.desc = "ISA-only PC",
|
|
|
|
.init = pc_init_isa,
|
|
|
|
.max_cpus = 1,
|
2012-02-22 07:18:56 +00:00
|
|
|
.compat_props = (GlobalProperty[]) {
|
|
|
|
{
|
|
|
|
.driver = "pc-sysfw",
|
|
|
|
.property = "rom_only",
|
|
|
|
.value = stringify(1),
|
|
|
|
},
|
2013-05-29 08:27:24 +00:00
|
|
|
{
|
|
|
|
.driver = "pc-sysfw",
|
|
|
|
.property = "isapc_ram_fw",
|
|
|
|
.value = stringify(1),
|
|
|
|
},
|
2012-02-22 07:18:56 +00:00
|
|
|
{ /* end of list */ }
|
|
|
|
},
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-05-14 07:29:15 +00:00
|
|
|
};
|
|
|
|
|
2010-06-30 11:58:34 +00:00
|
|
|
#ifdef CONFIG_XEN
|
|
|
|
static QEMUMachine xenfv_machine = {
|
|
|
|
.name = "xenfv",
|
|
|
|
.desc = "Xen Fully-virtualized PC",
|
|
|
|
.init = pc_xen_hvm_init,
|
|
|
|
.max_cpus = HVM_MAX_VCPUS,
|
|
|
|
.default_machine_opts = "accel=xen",
|
2013-01-08 07:06:30 +00:00
|
|
|
DEFAULT_MACHINE_OPTIONS,
|
2010-06-30 11:58:34 +00:00
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2010-05-14 07:29:15 +00:00
|
|
|
static void pc_machine_init(void)
|
|
|
|
{
|
2013-05-27 20:23:53 +00:00
|
|
|
qemu_register_machine(&pc_i440fx_machine_v1_6);
|
2013-02-08 13:06:15 +00:00
|
|
|
qemu_register_machine(&pc_i440fx_machine_v1_5);
|
2013-01-08 07:53:13 +00:00
|
|
|
qemu_register_machine(&pc_i440fx_machine_v1_4);
|
2012-09-13 09:08:00 +00:00
|
|
|
qemu_register_machine(&pc_machine_v1_3);
|
2012-06-11 08:38:22 +00:00
|
|
|
qemu_register_machine(&pc_machine_v1_2);
|
2012-02-22 07:18:55 +00:00
|
|
|
qemu_register_machine(&pc_machine_v1_1);
|
2011-11-07 15:33:08 +00:00
|
|
|
qemu_register_machine(&pc_machine_v1_0);
|
2011-12-18 18:59:12 +00:00
|
|
|
qemu_register_machine(&pc_machine_v0_15);
|
2011-11-07 15:33:08 +00:00
|
|
|
qemu_register_machine(&pc_machine_v0_14);
|
2010-11-11 11:59:25 +00:00
|
|
|
qemu_register_machine(&pc_machine_v0_13);
|
2010-05-14 07:29:15 +00:00
|
|
|
qemu_register_machine(&pc_machine_v0_12);
|
|
|
|
qemu_register_machine(&pc_machine_v0_11);
|
|
|
|
qemu_register_machine(&pc_machine_v0_10);
|
|
|
|
qemu_register_machine(&isapc_machine);
|
2010-06-30 11:58:34 +00:00
|
|
|
#ifdef CONFIG_XEN
|
|
|
|
qemu_register_machine(&xenfv_machine);
|
|
|
|
#endif
|
2010-05-14 07:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
machine_init(pc_machine_init);
|