2004-03-14 13:20:30 +01:00
|
|
|
/*
|
|
|
|
|
* QEMU PC System Emulator
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2004-03-14 13:20:30 +01:00
|
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
2007-09-16 23:08:06 +02:00
|
|
|
*
|
2004-03-14 13:20:30 +01:00
|
|
|
* 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 12:18:31 +01:00
|
|
|
|
2016-01-26 19:17:03 +01:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-29 16:22:13 +02:00
|
|
|
#include "qemu/units.h"
|
2019-10-08 11:56:49 +02:00
|
|
|
#include "hw/i386/x86.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i386/pc.h"
|
|
|
|
|
#include "hw/char/serial.h"
|
2018-03-08 23:39:22 +01:00
|
|
|
#include "hw/char/parallel.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/i386/apic.h"
|
2014-12-19 02:43:35 +01:00
|
|
|
#include "hw/i386/topology.h"
|
2019-04-22 18:58:21 +02:00
|
|
|
#include "hw/i386/fw_cfg.h"
|
2020-03-12 17:54:22 +01:00
|
|
|
#include "hw/i386/vmport.h"
|
2014-12-19 02:43:35 +01:00
|
|
|
#include "sysemu/cpus.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/block/fdc.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/ide.h"
|
|
|
|
|
#include "hw/pci/pci.h"
|
2015-06-02 13:23:07 +02:00
|
|
|
#include "hw/pci/pci_bus.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/nvram/fw_cfg.h"
|
|
|
|
|
#include "hw/timer/hpet.h"
|
2018-12-11 17:34:06 +01:00
|
|
|
#include "hw/firmware/smbios.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/loader.h"
|
2009-09-20 16:58:02 +02:00
|
|
|
#include "elf.h"
|
2019-08-12 07:23:45 +02:00
|
|
|
#include "migration/vmstate.h"
|
2013-03-18 17:36:02 +01:00
|
|
|
#include "multiboot.h"
|
2019-10-04 01:03:53 +02:00
|
|
|
#include "hw/rtc/mc146818rtc.h"
|
2019-12-12 17:15:43 +01:00
|
|
|
#include "hw/intc/i8259.h"
|
2018-03-08 23:39:23 +01:00
|
|
|
#include "hw/dma/i8257.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/timer/i8254.h"
|
2018-03-08 23:39:24 +01:00
|
|
|
#include "hw/input/i8042.h"
|
2019-08-12 07:23:42 +02:00
|
|
|
#include "hw/irq.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/audio/pcspk.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/pci/msi.h"
|
|
|
|
|
#include "hw/sysbus.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2019-05-23 16:35:05 +02:00
|
|
|
#include "sysemu/tcg.h"
|
2015-02-08 19:51:16 +01:00
|
|
|
#include "sysemu/numa.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/kvm.h"
|
2020-05-08 12:02:22 +02:00
|
|
|
#include "sysemu/xen.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2019-08-12 07:23:59 +02:00
|
|
|
#include "sysemu/runstate.h"
|
2020-12-12 16:55:08 +01:00
|
|
|
#include "kvm/kvm_i386.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/xen/xen.h"
|
2019-01-15 13:18:06 +01:00
|
|
|
#include "hw/xen/start_info.h"
|
2010-04-27 11:50:11 +02:00
|
|
|
#include "ui/qemu-spice.h"
|
2012-12-17 18:19:49 +01:00
|
|
|
#include "exec/memory.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/bitmap.h"
|
2013-03-21 00:23:17 +01:00
|
|
|
#include "qemu/config-file.h"
|
2015-03-17 18:29:20 +01:00
|
|
|
#include "qemu/error-report.h"
|
2018-02-01 12:18:46 +01:00
|
|
|
#include "qemu/option.h"
|
2019-10-10 15:49:39 +02:00
|
|
|
#include "qemu/cutils.h"
|
2013-04-15 08:19:22 +02:00
|
|
|
#include "hw/acpi/acpi.h"
|
2014-03-14 20:33:51 +01:00
|
|
|
#include "hw/acpi/cpu_hotplug.h"
|
i386: ACPI table generation code from seabios
This adds C code for generating ACPI tables at runtime,
imported from seabios git tree
commit 51684b7ced75fb76776e8ee84833fcfb6ecf12dd
Although ACPI tables come from a system BIOS on real hw,
it makes sense that the ACPI tables are coupled with the
virtual machine, since they have to abstract the x86 machine to
the OS's.
This is widely desired as a way to avoid the churn
and proliferation of QEMU-specific interfaces
associated with ACPI tables in bios code.
Notes:
As BIOS can reprogram devices prior to loading
ACPI tables, we pre-format ACPI tables but defer loading
hardware configuration there until tables are loaded.
The code structure was intentionally kept as close
to the seabios original as possible, to simplify
comparison and making sure we didn't lose anything
in translation.
Minor code duplication results, to help ensure there are no functional
regressions, I think it's better to merge it like this and do more code
changes in follow-up patches.
Cross-version compatibility concerns have been addressed:
ACPI tables are exposed to guest as FW_CFG entries.
When running with -M 1.5 and older, this patch disables ACPI
table generation, and doesn't expose ACPI
tables to guest.
As table content is likely to change over time,
the following measures are taken to simplify
cross-version migration:
- All tables besides the RSDP are packed in a single FW CFG entry.
This entry size is currently 23K. We round it up to 64K
to avoid too much churn there.
- Tables are placed in special ROM blob (not mapped into guest memory)
which is automatically migrated together with the guest, same
as BIOS code.
- Offsets where hardware configuration is loaded in ACPI tables
are also migrated, this is in case future ACPI changes make us
rearrange the tables in memory.
This patch reuses some code from SeaBIOS, which was originally under
LGPLv2 and then relicensed to GPLv3 or LGPLv3, in QEMU under GPLv2+. This
relicensing has been acked by all contributors that had contributed to the
code since the v2->v3 relicense. ACKs approving the v2+ relicensing are
listed below. The list might include ACKs from people not holding
copyright on any parts of the reused code, but it's better to err on the
side of caution and include them.
Affected SeaBIOS files (GPLv2+ license headers added)
<http://thread.gmane.org/gmane.comp.bios.coreboot.seabios/5949>:
src/acpi-dsdt-cpu-hotplug.dsl
src/acpi-dsdt-dbug.dsl
src/acpi-dsdt-hpet.dsl
src/acpi-dsdt-isa.dsl
src/acpi-dsdt-pci-crs.dsl
src/acpi.c
src/acpi.h
src/ssdt-misc.dsl
src/ssdt-pcihp.dsl
src/ssdt-proc.dsl
tools/acpi_extract.py
tools/acpi_extract_preprocess.py
Each one of the listed people agreed to the following:
> If you allow the use of your contribution in QEMU under the
> terms of GPLv2 or later as proposed by this patch,
> please respond to this mail including the line:
>
> Acked-by: Name <email address>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Jason Baron <jbaron@akamai.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Dave Frodin <dave.frodin@se-eng.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Kevin O'Connor <kevin@koconnor.net>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Acked-by: Isaku Yamahata <yamahata@valinux.co.jp>
Acked-by: Magnus Christensson <magnus.christensson@intel.com>
Acked-by: Hu Tao <hutao@cn.fujitsu.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2013-07-24 17:56:14 +02:00
|
|
|
#include "acpi-build.h"
|
2014-06-02 15:25:12 +02:00
|
|
|
#include "hw/mem/pc-dimm.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 12:46:47 +01:00
|
|
|
#include "hw/mem/nvdimm.h"
|
2018-02-01 12:18:31 +01:00
|
|
|
#include "qapi/error.h"
|
2018-02-11 10:36:01 +01:00
|
|
|
#include "qapi/qapi-visit-common.h"
|
2014-06-02 15:25:27 +02:00
|
|
|
#include "qapi/visitor.h"
|
2019-07-09 17:20:52 +02:00
|
|
|
#include "hw/core/cpu.h"
|
2018-12-12 18:57:53 +01:00
|
|
|
#include "hw/usb.h"
|
2016-10-19 14:05:42 +02:00
|
|
|
#include "hw/i386/intel_iommu.h"
|
2017-10-17 18:44:22 +02:00
|
|
|
#include "hw/net/ne2000-isa.h"
|
2019-01-17 13:49:03 +01:00
|
|
|
#include "standard-headers/asm-x86/bootparam.h"
|
2019-06-19 11:49:07 +02:00
|
|
|
#include "hw/virtio/virtio-pmem-pci.h"
|
2020-06-26 09:22:42 +02:00
|
|
|
#include "hw/virtio/virtio-mem-pci.h"
|
2019-06-19 11:49:07 +02:00
|
|
|
#include "hw/mem/memory-device.h"
|
2019-06-20 07:45:24 +02:00
|
|
|
#include "sysemu/replay.h"
|
|
|
|
|
#include "qapi/qmp/qerror.h"
|
2019-08-19 00:54:01 +02:00
|
|
|
#include "e820_memory_layout.h"
|
2019-09-16 12:49:28 +02:00
|
|
|
#include "fw_cfg.h"
|
2019-12-13 11:50:57 +01:00
|
|
|
#include "trace.h"
|
2020-02-03 11:42:03 +01:00
|
|
|
#include CONFIG_DEVICES
|
2010-05-29 22:23:49 +02:00
|
|
|
|
2021-08-31 03:54:26 +02:00
|
|
|
GlobalProperty pc_compat_6_1[] = {};
|
|
|
|
|
const size_t pc_compat_6_1_len = G_N_ELEMENTS(pc_compat_6_1);
|
|
|
|
|
|
2021-05-07 15:36:49 +02:00
|
|
|
GlobalProperty pc_compat_6_0[] = {
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "family", "6" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "model", "6" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "stepping", "3" },
|
2021-07-08 02:36:23 +02:00
|
|
|
{ TYPE_X86_CPU, "x-vendor-cpuid-only", "off" },
|
2021-08-16 10:32:14 +02:00
|
|
|
{ "ICH9-LPC", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" },
|
2021-05-07 15:36:49 +02:00
|
|
|
};
|
2021-03-31 13:19:00 +02:00
|
|
|
const size_t pc_compat_6_0_len = G_N_ELEMENTS(pc_compat_6_0);
|
|
|
|
|
|
2020-12-07 15:07:39 +01:00
|
|
|
GlobalProperty pc_compat_5_2[] = {
|
|
|
|
|
{ "ICH9-LPC", "x-smi-cpu-hotunplug", "off" },
|
|
|
|
|
};
|
2020-11-09 18:39:28 +01:00
|
|
|
const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2);
|
|
|
|
|
|
2020-09-23 11:46:40 +02:00
|
|
|
GlobalProperty pc_compat_5_1[] = {
|
|
|
|
|
{ "ICH9-LPC", "x-smi-cpu-hotplug", "off" },
|
2020-10-05 16:18:19 +02:00
|
|
|
{ TYPE_X86_CPU, "kvm-msi-ext-dest-id", "off" },
|
2020-09-23 11:46:40 +02:00
|
|
|
};
|
2020-08-19 16:40:16 +02:00
|
|
|
const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);
|
|
|
|
|
|
hw/pci-host: save/restore pci host config register
The pci host config register is used to save PCI address for
read/write config data. If guest writes a value to config register,
and then QEMU pauses the vcpu to migrate, after the migration, the guest
will continue to write pci config data, and the write data will be ignored
because of new qemu process losing the config register state.
To trigger the bug:
1. guest is booting in seabios.
2. guest enables the SMRAM in seabios:piix4_apmc_smm_setup, and then
expects to disable the SMRAM by pci_config_writeb.
3. after guest writes the pci host config register, QEMU pauses vcpu
to finish migration.
4. guest write of config data(0x0A) fails to disable the SMRAM because
the config register state is lost.
5. guest continues to boot and crashes in ipxe option ROM due to SMRAM
in enabled state.
Example Reproducer:
step 1. Make modifications to seabios and qemu for increase reproduction
efficiency, write 0xf0 to 0x402 port notify qemu to stop vcpu after
0x0cf8 port wrote i440 configure register. qemu stop vcpu when catch
0x402 port wrote 0xf0.
seabios:/src/hw/pci.c
@@ -52,6 +52,11 @@ void pci_config_writeb(u16 bdf, u32 addr, u8 val)
writeb(mmconfig_addr(bdf, addr), val);
} else {
outl(ioconfig_cmd(bdf, addr), PORT_PCI_CMD);
+ if (bdf == 0 && addr == 0x72 && val == 0xa) {
+ dprintf(1, "stop vcpu\n");
+ outb(0xf0, 0x402); // notify qemu to stop vcpu
+ dprintf(1, "resume vcpu\n");
+ }
outb(val, PORT_PCI_DATA + (addr & 3));
}
}
qemu:hw/char/debugcon.c
@@ -60,6 +61,9 @@ static void debugcon_ioport_write(void *opaque, hwaddr addr, uint64_t val,
printf(" [debugcon: write addr=0x%04" HWADDR_PRIx " val=0x%02" PRIx64 "]\n", addr, val);
#endif
+ if (ch == 0xf0) {
+ vm_stop(RUN_STATE_PAUSED);
+ }
/* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(&s->chr, &ch, 1);
step 2. start vm1 by the following command line, and then vm stopped.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\
-netdev tap,ifname=tap-test,id=hostnet0,vhost=on,downscript=no,script=no\
-device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\
-device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\
-chardev file,id=seabios,path=/var/log/test.seabios,append=on\
-device isa-debugcon,iobase=0x402,chardev=seabios\
-monitor stdio
step 3. start vm2 to accept vm1 state.
$ qemu-system-x86_64 -machine pc-i440fx-5.0,accel=kvm\
-netdev tap,ifname=tap-test1,id=hostnet0,vhost=on,downscript=no,script=no\
-device virtio-net-pci,netdev=hostnet0,id=net0,bus=pci.0,addr=0x13,bootindex=3\
-device cirrus-vga,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2\
-chardev file,id=seabios,path=/var/log/test.seabios,append=on\
-device isa-debugcon,iobase=0x402,chardev=seabios\
-monitor stdio \
-incoming tcp:127.0.0.1:8000
step 4. execute the following qmp command in vm1 to migrate.
(qemu) migrate tcp:127.0.0.1:8000
step 5. execute the following qmp command in vm2 to resume vcpu.
(qemu) cont
Before this patch, we get KVM "emulation failure" error on vm2.
This patch fixes it.
Cc: qemu-stable@nongnu.org
Signed-off-by: Hogan Wang <hogan.wang@huawei.com>
Message-Id: <20200727084621.3279-1-hogan.wang@huawei.com>
Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2020-07-27 10:46:20 +02:00
|
|
|
GlobalProperty pc_compat_5_0[] = {
|
|
|
|
|
};
|
2020-04-29 16:46:05 +02:00
|
|
|
const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0);
|
|
|
|
|
|
2019-12-09 14:08:55 +01:00
|
|
|
GlobalProperty pc_compat_4_2[] = {
|
|
|
|
|
{ "mch", "smbase-smram", "off" },
|
|
|
|
|
};
|
2019-11-12 11:48:11 +01:00
|
|
|
const size_t pc_compat_4_2_len = G_N_ELEMENTS(pc_compat_4_2);
|
|
|
|
|
|
2019-07-24 12:35:24 +02:00
|
|
|
GlobalProperty pc_compat_4_1[] = {};
|
|
|
|
|
const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1);
|
|
|
|
|
|
2019-04-11 12:20:25 +02:00
|
|
|
GlobalProperty pc_compat_4_0[] = {};
|
|
|
|
|
const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_3_1[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "intel-iommu", "dma-drain", "off" },
|
2018-12-20 13:07:32 +01:00
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
|
|
|
|
|
{ "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" },
|
2019-01-21 16:50:51 +01:00
|
|
|
{ "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" },
|
|
|
|
|
{ "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" },
|
2018-12-20 13:07:32 +01:00
|
|
|
{ "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" },
|
2019-01-21 16:50:51 +01:00
|
|
|
{ "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" },
|
|
|
|
|
{ "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" },
|
|
|
|
|
{ "EPYC" "-" TYPE_X86_CPU, "npt", "off" },
|
|
|
|
|
{ "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" },
|
|
|
|
|
{ "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" },
|
|
|
|
|
{ "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" },
|
2018-12-20 13:11:00 +01:00
|
|
|
{ "Skylake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Skylake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Cascadelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
|
|
|
|
|
{ "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
|
2018-12-27 03:43:03 +01:00
|
|
|
{ "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },
|
2019-01-30 00:52:59 +01:00
|
|
|
{ TYPE_X86_CPU, "x-intel-pt-auto-level", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_3_0[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "x-hv-synic-kvm-only", "on" },
|
|
|
|
|
{ "Skylake-Server" "-" TYPE_X86_CPU, "pku", "off" },
|
|
|
|
|
{ "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "pku", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_12[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "legacy-cache", "on" },
|
|
|
|
|
{ TYPE_X86_CPU, "topoext", "off" },
|
|
|
|
|
{ "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
|
|
|
|
|
{ "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_11[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "x-migrate-smi-count", "off" },
|
|
|
|
|
{ "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_10[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "x-hv-max-vps", "0x40" },
|
|
|
|
|
{ "i440FX-pcihost", "x-pci-hole64-fix", "off" },
|
|
|
|
|
{ "q35-pcihost", "x-pci-hole64-fix", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_9[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "mch", "extended-tseg-mbytes", "0" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_9_len = G_N_ELEMENTS(pc_compat_2_9);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_8[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "tcg-cpuid", "off" },
|
|
|
|
|
{ "kvmclock", "x-mach-use-reliable-get-clock", "off" },
|
|
|
|
|
{ "ICH9-LPC", "x-smi-broadcast", "off" },
|
|
|
|
|
{ TYPE_X86_CPU, "vmware-cpuid-freq", "off" },
|
|
|
|
|
{ "Haswell-" TYPE_X86_CPU, "stepping", "1" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_8_len = G_N_ELEMENTS(pc_compat_2_8);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_7[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "l3-cache", "off" },
|
|
|
|
|
{ TYPE_X86_CPU, "full-cpuid-auto-level", "off" },
|
|
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "family", "15" },
|
|
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "model", "6" },
|
|
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "stepping", "1" },
|
|
|
|
|
{ "isa-pcspk", "migrate", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_7_len = G_N_ELEMENTS(pc_compat_2_7);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_6[] = {
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "cpuid-0xb", "off" },
|
|
|
|
|
{ "vmxnet3", "romfile", "" },
|
|
|
|
|
{ TYPE_X86_CPU, "fill-mtrr-mask", "off" },
|
|
|
|
|
{ "apic-common", "legacy-instance-id", "on", }
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_5[] = {};
|
|
|
|
|
const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_4[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("2.4.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "Haswell-" TYPE_X86_CPU, "abm", "off" },
|
|
|
|
|
{ "Haswell-noTSX-" TYPE_X86_CPU, "abm", "off" },
|
|
|
|
|
{ "Broadwell-" TYPE_X86_CPU, "abm", "off" },
|
|
|
|
|
{ "Broadwell-noTSX-" TYPE_X86_CPU, "abm", "off" },
|
|
|
|
|
{ "host" "-" TYPE_X86_CPU, "host-cache-info", "on" },
|
|
|
|
|
{ TYPE_X86_CPU, "check", "off" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "sse4a", "on" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "abm", "on" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "popcnt", "on" },
|
|
|
|
|
{ "qemu32" "-" TYPE_X86_CPU, "popcnt", "on" },
|
|
|
|
|
{ "Opteron_G2" "-" TYPE_X86_CPU, "rdtscp", "on" },
|
|
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "on" },
|
|
|
|
|
{ "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "on" },
|
|
|
|
|
{ "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "on", }
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_3[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("2.3.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_X86_CPU, "arat", "off" },
|
|
|
|
|
{ "qemu64" "-" TYPE_X86_CPU, "min-level", "4" },
|
|
|
|
|
{ "kvm64" "-" TYPE_X86_CPU, "min-level", "5" },
|
|
|
|
|
{ "pentium3" "-" TYPE_X86_CPU, "min-level", "2" },
|
|
|
|
|
{ "n270" "-" TYPE_X86_CPU, "min-level", "5" },
|
|
|
|
|
{ "Conroe" "-" TYPE_X86_CPU, "min-level", "4" },
|
|
|
|
|
{ "Penryn" "-" TYPE_X86_CPU, "min-level", "4" },
|
|
|
|
|
{ "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" },
|
|
|
|
|
{ "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" },
|
|
|
|
|
{ TYPE_X86_CPU, "kvm-no-smi-migration", "on" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_2[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("2.2.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "kvm64" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "kvm32" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Conroe" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Penryn" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Nehalem" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Westmere" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Haswell" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Broadwell" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" },
|
|
|
|
|
{ "Haswell" "-" TYPE_X86_CPU, "f16c", "off" },
|
|
|
|
|
{ "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" },
|
|
|
|
|
{ "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" },
|
|
|
|
|
{ "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2);
|
|
|
|
|
|
2018-12-12 16:36:30 +01:00
|
|
|
GlobalProperty pc_compat_2_1[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("2.1.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "coreduo" "-" TYPE_X86_CPU, "vmx", "on" },
|
|
|
|
|
{ "core2duo" "-" TYPE_X86_CPU, "vmx", "on" },
|
2018-12-12 16:36:30 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1);
|
|
|
|
|
|
2018-12-12 18:57:53 +01:00
|
|
|
GlobalProperty pc_compat_2_0[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("2.0.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "virtio-scsi-pci", "any_layout", "off" },
|
|
|
|
|
{ "PIIX4_PM", "memory-hotplug-support", "off" },
|
|
|
|
|
{ "apic", "version", "0x11" },
|
|
|
|
|
{ "nec-usb-xhci", "superspeed-ports-first", "off" },
|
|
|
|
|
{ "nec-usb-xhci", "force-pcie-endcap", "on" },
|
|
|
|
|
{ "pci-serial", "prog_if", "0" },
|
|
|
|
|
{ "pci-serial-2x", "prog_if", "0" },
|
|
|
|
|
{ "pci-serial-4x", "prog_if", "0" },
|
|
|
|
|
{ "virtio-net-pci", "guest_announce", "off" },
|
|
|
|
|
{ "ICH9-LPC", "memory-hotplug-support", "off" },
|
|
|
|
|
{ "xio3130-downstream", COMPAT_PROP_PCP, "off" },
|
|
|
|
|
{ "ioh3420", COMPAT_PROP_PCP, "off" },
|
2018-12-12 18:57:53 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0);
|
|
|
|
|
|
|
|
|
|
GlobalProperty pc_compat_1_7[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("1.7.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ TYPE_USB_DEVICE, "msos-desc", "no" },
|
2021-08-16 10:32:14 +02:00
|
|
|
{ "PIIX4_PM", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" },
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "hpet", HPET_INTCAP, "4" },
|
2018-12-12 18:57:53 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7);
|
|
|
|
|
|
|
|
|
|
GlobalProperty pc_compat_1_6[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("1.6.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "e1000", "mitigation", "off" },
|
|
|
|
|
{ "qemu64-" TYPE_X86_CPU, "model", "2" },
|
|
|
|
|
{ "qemu32-" TYPE_X86_CPU, "model", "3" },
|
|
|
|
|
{ "i440FX-pcihost", "short_root_bus", "1" },
|
|
|
|
|
{ "q35-pcihost", "short_root_bus", "1" },
|
2018-12-12 18:57:53 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6);
|
|
|
|
|
|
|
|
|
|
GlobalProperty pc_compat_1_5[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("1.5.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "Conroe-" TYPE_X86_CPU, "model", "2" },
|
|
|
|
|
{ "Conroe-" TYPE_X86_CPU, "min-level", "2" },
|
|
|
|
|
{ "Penryn-" TYPE_X86_CPU, "model", "2" },
|
|
|
|
|
{ "Penryn-" TYPE_X86_CPU, "min-level", "2" },
|
|
|
|
|
{ "Nehalem-" TYPE_X86_CPU, "model", "2" },
|
|
|
|
|
{ "Nehalem-" TYPE_X86_CPU, "min-level", "2" },
|
|
|
|
|
{ "virtio-net-pci", "any_layout", "off" },
|
|
|
|
|
{ TYPE_X86_CPU, "pmu", "on" },
|
|
|
|
|
{ "i440FX-pcihost", "short_root_bus", "0" },
|
|
|
|
|
{ "q35-pcihost", "short_root_bus", "0" },
|
2018-12-12 18:57:53 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5);
|
|
|
|
|
|
|
|
|
|
GlobalProperty pc_compat_1_4[] = {
|
|
|
|
|
PC_CPU_MODEL_IDS("1.4.0")
|
2019-01-07 20:30:20 +01:00
|
|
|
{ "scsi-hd", "discard_granularity", "0" },
|
|
|
|
|
{ "scsi-cd", "discard_granularity", "0" },
|
|
|
|
|
{ "ide-hd", "discard_granularity", "0" },
|
|
|
|
|
{ "ide-cd", "discard_granularity", "0" },
|
|
|
|
|
{ "virtio-blk-pci", "discard_granularity", "0" },
|
|
|
|
|
/* DEV_NVECTORS_UNSPECIFIED as a uint32_t string: */
|
|
|
|
|
{ "virtio-serial-pci", "vectors", "0xFFFFFFFF" },
|
|
|
|
|
{ "virtio-net-pci", "ctrl_guest_offloads", "off" },
|
|
|
|
|
{ "e1000", "romfile", "pxe-e1000.rom" },
|
|
|
|
|
{ "ne2k_pci", "romfile", "pxe-ne2k_pci.rom" },
|
|
|
|
|
{ "pcnet", "romfile", "pxe-pcnet.rom" },
|
|
|
|
|
{ "rtl8139", "romfile", "pxe-rtl8139.rom" },
|
|
|
|
|
{ "virtio-net-pci", "romfile", "pxe-virtio.rom" },
|
|
|
|
|
{ "486-" TYPE_X86_CPU, "model", "0" },
|
|
|
|
|
{ "n270" "-" TYPE_X86_CPU, "movbe", "off" },
|
|
|
|
|
{ "Westmere" "-" TYPE_X86_CPU, "pclmulqdq", "off" },
|
2018-12-12 18:57:53 +01:00
|
|
|
};
|
|
|
|
|
const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
|
|
|
|
|
|
2019-10-18 15:59:06 +02:00
|
|
|
GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled)
|
|
|
|
|
{
|
|
|
|
|
GSIState *s;
|
|
|
|
|
|
|
|
|
|
s = g_new0(GSIState, 1);
|
|
|
|
|
if (kvm_ioapic_in_kernel()) {
|
|
|
|
|
kvm_pc_setup_irq_routing(pci_enabled);
|
|
|
|
|
}
|
2019-12-13 12:07:36 +01:00
|
|
|
*irqs = qemu_allocate_irqs(gsi_handler, s, GSI_NUM_PINS);
|
2019-10-18 15:59:06 +02:00
|
|
|
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
2012-09-19 13:50:08 +02:00
|
|
|
static void ioport80_write(void *opaque, hwaddr addr, uint64_t data,
|
|
|
|
|
unsigned size)
|
2004-03-14 13:20:30 +01:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-09 19:10:22 +01:00
|
|
|
static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)
|
|
|
|
|
{
|
2013-01-11 17:41:43 +01:00
|
|
|
return 0xffffffffffffffffULL;
|
2013-01-09 19:10:22 +01:00
|
|
|
}
|
|
|
|
|
|
2004-05-08 23:03:41 +02:00
|
|
|
/* MSDOS compatibility mode FPU exception support */
|
2012-09-19 13:50:08 +02:00
|
|
|
static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data,
|
|
|
|
|
unsigned size)
|
2004-05-08 23:03:41 +02:00
|
|
|
{
|
2019-10-16 10:18:10 +02:00
|
|
|
if (tcg_enabled()) {
|
2019-10-16 10:34:39 +02:00
|
|
|
cpu_set_ignne();
|
2019-10-16 10:18:10 +02:00
|
|
|
}
|
2004-05-08 23:03:41 +02:00
|
|
|
}
|
|
|
|
|
|
2013-01-09 19:10:22 +01:00
|
|
|
static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)
|
|
|
|
|
{
|
2013-01-11 17:41:43 +01:00
|
|
|
return 0xffffffffffffffffULL;
|
2013-01-09 19:10:22 +01:00
|
|
|
}
|
|
|
|
|
|
2004-03-31 20:58:38 +02:00
|
|
|
/* PC cmos mappings */
|
|
|
|
|
|
2004-03-14 13:20:30 +01:00
|
|
|
#define REG_EQUIPMENT_BYTE 0x14
|
|
|
|
|
|
2012-07-10 11:12:38 +02:00
|
|
|
static void cmos_init_hd(ISADevice *s, int type_ofs, int info_ofs,
|
|
|
|
|
int16_t cylinders, int8_t heads, int8_t sectors)
|
2004-10-09 18:47:59 +02:00
|
|
|
{
|
|
|
|
|
rtc_set_memory(s, type_ofs, 47);
|
|
|
|
|
rtc_set_memory(s, info_ofs, cylinders);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 1, cylinders >> 8);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 2, heads);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 3, 0xff);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 4, 0xff);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 5, 0xc0 | ((heads > 8) << 3));
|
|
|
|
|
rtc_set_memory(s, info_ofs + 6, cylinders);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 7, cylinders >> 8);
|
|
|
|
|
rtc_set_memory(s, info_ofs + 8, sectors);
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-31 02:54:04 +01:00
|
|
|
/* convert boot_device letter to something recognizable by the bios */
|
|
|
|
|
static int boot_device2nibble(char boot_device)
|
|
|
|
|
{
|
|
|
|
|
switch(boot_device) {
|
|
|
|
|
case 'a':
|
|
|
|
|
case 'b':
|
|
|
|
|
return 0x01; /* floppy boot */
|
|
|
|
|
case 'c':
|
|
|
|
|
return 0x02; /* hard drive boot */
|
|
|
|
|
case 'd':
|
|
|
|
|
return 0x03; /* CD-ROM boot */
|
|
|
|
|
case 'n':
|
|
|
|
|
return 0x04; /* Network boot */
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-03 20:04:02 +01:00
|
|
|
static void set_boot_dev(ISADevice *s, const char *boot_device, Error **errp)
|
2008-05-04 22:11:34 +02:00
|
|
|
{
|
|
|
|
|
#define PC_MAX_BOOT_DEVICES 3
|
|
|
|
|
int nbds, bds[3] = { 0, };
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
nbds = strlen(boot_device);
|
|
|
|
|
if (nbds > PC_MAX_BOOT_DEVICES) {
|
2014-12-03 20:04:02 +01:00
|
|
|
error_setg(errp, "Too many boot devices for PC");
|
|
|
|
|
return;
|
2008-05-04 22:11:34 +02:00
|
|
|
}
|
|
|
|
|
for (i = 0; i < nbds; i++) {
|
|
|
|
|
bds[i] = boot_device2nibble(boot_device[i]);
|
|
|
|
|
if (bds[i] == 0) {
|
2014-12-03 20:04:02 +01:00
|
|
|
error_setg(errp, "Invalid boot device for PC: '%c'",
|
|
|
|
|
boot_device[i]);
|
|
|
|
|
return;
|
2008-05-04 22:11:34 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
rtc_set_memory(s, 0x3d, (bds[1] << 4) | bds[0]);
|
2010-02-17 18:07:48 +01:00
|
|
|
rtc_set_memory(s, 0x38, (bds[2] << 4) | (fd_bootchk ? 0x0 : 0x1));
|
2008-05-04 22:11:34 +02:00
|
|
|
}
|
|
|
|
|
|
2014-12-03 20:04:02 +01:00
|
|
|
static void pc_boot_set(void *opaque, const char *boot_device, Error **errp)
|
2010-02-17 18:07:48 +01:00
|
|
|
{
|
2014-12-03 20:04:02 +01:00
|
|
|
set_boot_dev(opaque, boot_device, errp);
|
2010-02-17 18:07:48 +01:00
|
|
|
}
|
|
|
|
|
|
2015-06-25 15:35:05 +02:00
|
|
|
static void pc_cmos_init_floppy(ISADevice *rtc_state, ISADevice *floppy)
|
|
|
|
|
{
|
|
|
|
|
int val, nb, i;
|
2016-01-22 21:50:56 +01:00
|
|
|
FloppyDriveType fd_type[2] = { FLOPPY_DRIVE_TYPE_NONE,
|
|
|
|
|
FLOPPY_DRIVE_TYPE_NONE };
|
2015-06-25 15:35:05 +02:00
|
|
|
|
|
|
|
|
/* floppy type */
|
|
|
|
|
if (floppy) {
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
|
fd_type[i] = isa_fdc_get_drive_type(floppy, i);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
val = (cmos_get_fd_drive_type(fd_type[0]) << 4) |
|
|
|
|
|
cmos_get_fd_drive_type(fd_type[1]);
|
|
|
|
|
rtc_set_memory(rtc_state, 0x10, val);
|
|
|
|
|
|
|
|
|
|
val = rtc_get_memory(rtc_state, REG_EQUIPMENT_BYTE);
|
|
|
|
|
nb = 0;
|
2016-01-22 21:50:56 +01:00
|
|
|
if (fd_type[0] != FLOPPY_DRIVE_TYPE_NONE) {
|
2015-06-25 15:35:05 +02:00
|
|
|
nb++;
|
|
|
|
|
}
|
2016-01-22 21:50:56 +01:00
|
|
|
if (fd_type[1] != FLOPPY_DRIVE_TYPE_NONE) {
|
2015-06-25 15:35:05 +02:00
|
|
|
nb++;
|
|
|
|
|
}
|
|
|
|
|
switch (nb) {
|
|
|
|
|
case 0:
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
val |= 0x01; /* 1 drive, ready for boot */
|
|
|
|
|
break;
|
|
|
|
|
case 2:
|
|
|
|
|
val |= 0x41; /* 2 drives, ready for boot */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
rtc_set_memory(rtc_state, REG_EQUIPMENT_BYTE, val);
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-24 19:58:20 +02:00
|
|
|
typedef struct pc_cmos_init_late_arg {
|
|
|
|
|
ISADevice *rtc_state;
|
2012-07-10 11:12:38 +02:00
|
|
|
BusState *idebus[2];
|
2010-06-24 19:58:20 +02:00
|
|
|
} pc_cmos_init_late_arg;
|
|
|
|
|
|
hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS
With the pc-q35-2.4 machine type, if the user creates an ISA FDC manually:
-device isa-fdc,driveA=drive-fdc0-0-0 \
-drive file=...,if=none,id=drive-fdc0-0-0,format=raw
then the board-default FDC will be skipped, and only the explicitly
requested FDC will exist. qtree-wise, this is correct; however such an FDC
is currently not registered in the CMOS, because that code is only reached
for the board-default FDC.
The pc_cmos_init_late() one-shot reset handler -- one-shot because the
CMOS is not reprogrammed during warm reset -- should search for any ISA
FDC devices, created implicitly (by board code) or explicitly, and set the
CMOS accordingly to the ISA FDC(s) with iobase=0x3f0:
- if there is no such FDC, report both drives absent,
- if there is exactly one such FDC, report its drives in the CMOS,
- if there are more than one such FDCs, then pick one (it is not specified
which one), and print a warning about the ambiguity.
Cc: Jan Tomko <jtomko@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jan Tomko <jtomko@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2015-06-25 15:35:06 +02:00
|
|
|
typedef struct check_fdc_state {
|
|
|
|
|
ISADevice *floppy;
|
|
|
|
|
bool multiple;
|
|
|
|
|
} CheckFdcState;
|
|
|
|
|
|
|
|
|
|
static int check_fdc(Object *obj, void *opaque)
|
|
|
|
|
{
|
|
|
|
|
CheckFdcState *state = opaque;
|
|
|
|
|
Object *fdc;
|
|
|
|
|
uint32_t iobase;
|
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
|
|
fdc = object_dynamic_cast(obj, TYPE_ISA_FDC);
|
|
|
|
|
if (!fdc) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-07 18:36:22 +02:00
|
|
|
iobase = object_property_get_uint(obj, "iobase", &local_err);
|
hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS
With the pc-q35-2.4 machine type, if the user creates an ISA FDC manually:
-device isa-fdc,driveA=drive-fdc0-0-0 \
-drive file=...,if=none,id=drive-fdc0-0-0,format=raw
then the board-default FDC will be skipped, and only the explicitly
requested FDC will exist. qtree-wise, this is correct; however such an FDC
is currently not registered in the CMOS, because that code is only reached
for the board-default FDC.
The pc_cmos_init_late() one-shot reset handler -- one-shot because the
CMOS is not reprogrammed during warm reset -- should search for any ISA
FDC devices, created implicitly (by board code) or explicitly, and set the
CMOS accordingly to the ISA FDC(s) with iobase=0x3f0:
- if there is no such FDC, report both drives absent,
- if there is exactly one such FDC, report its drives in the CMOS,
- if there are more than one such FDCs, then pick one (it is not specified
which one), and print a warning about the ambiguity.
Cc: Jan Tomko <jtomko@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jan Tomko <jtomko@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2015-06-25 15:35:06 +02:00
|
|
|
if (local_err || iobase != 0x3f0) {
|
|
|
|
|
error_free(local_err);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state->floppy) {
|
|
|
|
|
state->multiple = true;
|
|
|
|
|
} else {
|
|
|
|
|
state->floppy = ISA_DEVICE(obj);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char * const fdc_container_path[] = {
|
|
|
|
|
"/unattached", "/peripheral", "/peripheral-anon"
|
|
|
|
|
};
|
|
|
|
|
|
2015-12-30 21:11:51 +01:00
|
|
|
/*
|
|
|
|
|
* Locate the FDC at IO address 0x3f0, in order to configure the CMOS registers
|
|
|
|
|
* and ACPI objects.
|
|
|
|
|
*/
|
|
|
|
|
ISADevice *pc_find_fdc0(void)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
Object *container;
|
|
|
|
|
CheckFdcState state = { 0 };
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(fdc_container_path); i++) {
|
|
|
|
|
container = container_get(qdev_get_machine(), fdc_container_path[i]);
|
|
|
|
|
object_child_foreach(container, check_fdc, &state);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (state.multiple) {
|
2017-07-12 15:57:41 +02:00
|
|
|
warn_report("multiple floppy disk controllers with "
|
|
|
|
|
"iobase=0x3f0 have been found");
|
2015-12-18 16:35:24 +01:00
|
|
|
error_printf("the one being picked for CMOS setup might not reflect "
|
2017-09-11 21:52:43 +02:00
|
|
|
"your intent");
|
2015-12-30 21:11:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return state.floppy;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-24 19:58:20 +02:00
|
|
|
static void pc_cmos_init_late(void *opaque)
|
|
|
|
|
{
|
|
|
|
|
pc_cmos_init_late_arg *arg = opaque;
|
|
|
|
|
ISADevice *s = arg->rtc_state;
|
2012-07-10 11:12:38 +02:00
|
|
|
int16_t cylinders;
|
|
|
|
|
int8_t heads, sectors;
|
2010-06-24 19:58:20 +02:00
|
|
|
int val;
|
2012-07-10 11:12:53 +02:00
|
|
|
int i, trans;
|
2010-06-24 19:58:20 +02:00
|
|
|
|
2012-07-10 11:12:38 +02:00
|
|
|
val = 0;
|
2016-11-05 08:19:49 +01:00
|
|
|
if (arg->idebus[0] && ide_get_geometry(arg->idebus[0], 0,
|
|
|
|
|
&cylinders, &heads, §ors) >= 0) {
|
2012-07-10 11:12:38 +02:00
|
|
|
cmos_init_hd(s, 0x19, 0x1b, cylinders, heads, sectors);
|
|
|
|
|
val |= 0xf0;
|
|
|
|
|
}
|
2016-11-05 08:19:49 +01:00
|
|
|
if (arg->idebus[0] && ide_get_geometry(arg->idebus[0], 1,
|
|
|
|
|
&cylinders, &heads, §ors) >= 0) {
|
2012-07-10 11:12:38 +02:00
|
|
|
cmos_init_hd(s, 0x1a, 0x24, cylinders, heads, sectors);
|
|
|
|
|
val |= 0x0f;
|
|
|
|
|
}
|
|
|
|
|
rtc_set_memory(s, 0x12, val);
|
2010-06-24 19:58:20 +02:00
|
|
|
|
|
|
|
|
val = 0;
|
|
|
|
|
for (i = 0; i < 4; i++) {
|
2012-07-10 11:12:38 +02:00
|
|
|
/* NOTE: ide_get_geometry() returns the physical
|
|
|
|
|
geometry. It is always such that: 1 <= sects <= 63, 1
|
|
|
|
|
<= heads <= 16, 1 <= cylinders <= 16383. The BIOS
|
|
|
|
|
geometry can be different if a translation is done. */
|
2016-11-05 08:19:49 +01:00
|
|
|
if (arg->idebus[i / 2] &&
|
|
|
|
|
ide_get_geometry(arg->idebus[i / 2], i % 2,
|
2012-07-10 11:12:38 +02:00
|
|
|
&cylinders, &heads, §ors) >= 0) {
|
2012-07-10 11:12:53 +02:00
|
|
|
trans = ide_get_bios_chs_trans(arg->idebus[i / 2], i % 2) - 1;
|
|
|
|
|
assert((trans & ~3) == 0);
|
|
|
|
|
val |= trans << (i * 2);
|
2010-06-24 19:58:20 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
rtc_set_memory(s, 0x39, val);
|
|
|
|
|
|
2015-12-30 21:11:51 +01:00
|
|
|
pc_cmos_init_floppy(s, pc_find_fdc0());
|
hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS
With the pc-q35-2.4 machine type, if the user creates an ISA FDC manually:
-device isa-fdc,driveA=drive-fdc0-0-0 \
-drive file=...,if=none,id=drive-fdc0-0-0,format=raw
then the board-default FDC will be skipped, and only the explicitly
requested FDC will exist. qtree-wise, this is correct; however such an FDC
is currently not registered in the CMOS, because that code is only reached
for the board-default FDC.
The pc_cmos_init_late() one-shot reset handler -- one-shot because the
CMOS is not reprogrammed during warm reset -- should search for any ISA
FDC devices, created implicitly (by board code) or explicitly, and set the
CMOS accordingly to the ISA FDC(s) with iobase=0x3f0:
- if there is no such FDC, report both drives absent,
- if there is exactly one such FDC, report its drives in the CMOS,
- if there are more than one such FDCs, then pick one (it is not specified
which one), and print a warning about the ambiguity.
Cc: Jan Tomko <jtomko@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jan Tomko <jtomko@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2015-06-25 15:35:06 +02:00
|
|
|
|
2010-06-24 19:58:20 +02:00
|
|
|
qemu_unregister_reset(pc_cmos_init_late, opaque);
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-07 21:55:49 +02:00
|
|
|
void pc_cmos_init(PCMachineState *pcms,
|
2015-06-25 15:35:07 +02:00
|
|
|
BusState *idebus0, BusState *idebus1,
|
2011-02-05 17:32:23 +01:00
|
|
|
ISADevice *s)
|
2004-03-14 13:20:30 +01:00
|
|
|
{
|
2015-06-25 15:35:05 +02:00
|
|
|
int val;
|
2010-06-24 19:58:20 +02:00
|
|
|
static pc_cmos_init_late_arg arg;
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2004-03-31 20:58:38 +02:00
|
|
|
|
|
|
|
|
/* various important CMOS locations needed by PC/Bochs bios */
|
2004-03-14 13:20:30 +01:00
|
|
|
|
|
|
|
|
/* memory size */
|
2012-08-15 13:12:20 +02:00
|
|
|
/* base memory (first MiB) */
|
2019-10-22 09:39:50 +02:00
|
|
|
val = MIN(x86ms->below_4g_mem_size / KiB, 640);
|
2004-04-07 22:51:30 +02:00
|
|
|
rtc_set_memory(s, 0x15, val);
|
|
|
|
|
rtc_set_memory(s, 0x16, val >> 8);
|
2012-08-15 13:12:20 +02:00
|
|
|
/* extended memory (next 64MiB) */
|
2019-10-22 09:39:50 +02:00
|
|
|
if (x86ms->below_4g_mem_size > 1 * MiB) {
|
|
|
|
|
val = (x86ms->below_4g_mem_size - 1 * MiB) / KiB;
|
2012-08-15 13:12:20 +02:00
|
|
|
} else {
|
|
|
|
|
val = 0;
|
|
|
|
|
}
|
2004-03-14 13:20:30 +01:00
|
|
|
if (val > 65535)
|
|
|
|
|
val = 65535;
|
2004-03-31 20:58:38 +02:00
|
|
|
rtc_set_memory(s, 0x17, val);
|
|
|
|
|
rtc_set_memory(s, 0x18, val >> 8);
|
|
|
|
|
rtc_set_memory(s, 0x30, val);
|
|
|
|
|
rtc_set_memory(s, 0x31, val >> 8);
|
2012-08-15 13:12:20 +02:00
|
|
|
/* memory between 16MiB and 4GiB */
|
2019-10-22 09:39:50 +02:00
|
|
|
if (x86ms->below_4g_mem_size > 16 * MiB) {
|
|
|
|
|
val = (x86ms->below_4g_mem_size - 16 * MiB) / (64 * KiB);
|
2012-08-15 13:12:20 +02:00
|
|
|
} else {
|
2004-06-26 17:53:17 +02:00
|
|
|
val = 0;
|
2012-08-15 13:12:20 +02:00
|
|
|
}
|
2004-03-14 13:20:30 +01:00
|
|
|
if (val > 65535)
|
|
|
|
|
val = 65535;
|
2004-03-31 20:58:38 +02:00
|
|
|
rtc_set_memory(s, 0x34, val);
|
|
|
|
|
rtc_set_memory(s, 0x35, val >> 8);
|
2012-08-15 13:12:20 +02:00
|
|
|
/* memory above 4GiB */
|
2019-10-22 09:39:50 +02:00
|
|
|
val = x86ms->above_4g_mem_size / 65536;
|
2012-08-15 13:12:20 +02:00
|
|
|
rtc_set_memory(s, 0x5b, val);
|
|
|
|
|
rtc_set_memory(s, 0x5c, val >> 8);
|
|
|
|
|
rtc_set_memory(s, 0x5d, val >> 16);
|
2007-09-17 10:09:54 +02:00
|
|
|
|
2015-08-07 21:55:49 +02:00
|
|
|
object_property_add_link(OBJECT(pcms), "rtc_state",
|
2014-10-22 05:24:29 +02:00
|
|
|
TYPE_ISA_DEVICE,
|
2019-10-22 09:39:50 +02:00
|
|
|
(Object **)&x86ms->rtc,
|
2014-10-22 05:24:29 +02: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 17:29:22 +02: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 18:05:54 +02:00
|
|
|
object_property_set_link(OBJECT(pcms), "rtc_state", OBJECT(s),
|
|
|
|
|
&error_abort);
|
2008-03-28 23:28:08 +01:00
|
|
|
|
2015-09-11 15:04:45 +02:00
|
|
|
set_boot_dev(s, MACHINE(pcms)->boot_order, &error_fatal);
|
2004-03-14 13:20:30 +01:00
|
|
|
|
2004-03-31 20:58:38 +02:00
|
|
|
val = 0;
|
|
|
|
|
val |= 0x02; /* FPU is there */
|
|
|
|
|
val |= 0x04; /* PS/2 mouse installed */
|
|
|
|
|
rtc_set_memory(s, REG_EQUIPMENT_BYTE, val);
|
|
|
|
|
|
hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS
With the pc-q35-2.4 machine type, if the user creates an ISA FDC manually:
-device isa-fdc,driveA=drive-fdc0-0-0 \
-drive file=...,if=none,id=drive-fdc0-0-0,format=raw
then the board-default FDC will be skipped, and only the explicitly
requested FDC will exist. qtree-wise, this is correct; however such an FDC
is currently not registered in the CMOS, because that code is only reached
for the board-default FDC.
The pc_cmos_init_late() one-shot reset handler -- one-shot because the
CMOS is not reprogrammed during warm reset -- should search for any ISA
FDC devices, created implicitly (by board code) or explicitly, and set the
CMOS accordingly to the ISA FDC(s) with iobase=0x3f0:
- if there is no such FDC, report both drives absent,
- if there is exactly one such FDC, report its drives in the CMOS,
- if there are more than one such FDCs, then pick one (it is not specified
which one), and print a warning about the ambiguity.
Cc: Jan Tomko <jtomko@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jan Tomko <jtomko@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2015-06-25 15:35:06 +02:00
|
|
|
/* hard drives and FDC */
|
2010-06-24 19:58:20 +02:00
|
|
|
arg.rtc_state = s;
|
2012-07-10 11:12:38 +02:00
|
|
|
arg.idebus[0] = idebus0;
|
|
|
|
|
arg.idebus[1] = idebus1;
|
2010-06-24 19:58:20 +02:00
|
|
|
qemu_register_reset(pc_cmos_init_late, &arg);
|
2004-03-14 13:20:30 +01:00
|
|
|
}
|
|
|
|
|
|
2010-05-22 09:59:01 +02:00
|
|
|
static void handle_a20_line_change(void *opaque, int irq, int level)
|
2005-11-22 00:34:32 +01:00
|
|
|
{
|
2013-01-18 15:19:06 +01:00
|
|
|
X86CPU *cpu = opaque;
|
2004-04-05 22:26:03 +02:00
|
|
|
|
2010-05-22 09:59:01 +02:00
|
|
|
/* XXX: send to all CPUs ? */
|
2011-01-06 19:24:35 +01:00
|
|
|
/* XXX: add logic to handle multiple A20 line sources */
|
2013-01-18 15:19:06 +01:00
|
|
|
x86_cpu_set_a20(cpu, level);
|
2004-04-05 22:26:03 +02:00
|
|
|
}
|
|
|
|
|
|
2004-03-14 22:46:48 +01:00
|
|
|
#define NE2000_NB_MAX 6
|
|
|
|
|
|
2009-09-13 10:32:37 +02:00
|
|
|
static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
|
|
|
|
|
0x280, 0x380 };
|
|
|
|
|
static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
|
2004-03-14 22:46:48 +01:00
|
|
|
|
2011-12-15 22:09:51 +01:00
|
|
|
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
|
2006-02-05 05:14:41 +01:00
|
|
|
{
|
|
|
|
|
static int nb_ne2k = 0;
|
|
|
|
|
|
|
|
|
|
if (nb_ne2k == NE2000_NB_MAX)
|
|
|
|
|
return;
|
2011-12-15 22:09:51 +01:00
|
|
|
isa_ne2000_init(bus, ne2000_io[nb_ne2k],
|
2009-09-10 11:43:33 +02:00
|
|
|
ne2000_irq[nb_ne2k], nd);
|
2006-02-05 05:14:41 +01:00
|
|
|
nb_ne2k++;
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-14 09:29:15 +02:00
|
|
|
void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
|
2010-03-29 21:23:52 +02:00
|
|
|
{
|
2013-01-18 15:03:43 +01:00
|
|
|
X86CPU *cpu = opaque;
|
2010-03-29 21:23:52 +02:00
|
|
|
|
|
|
|
|
if (level) {
|
2013-01-18 15:03:43 +01:00
|
|
|
cpu_interrupt(CPU(cpu), CPU_INTERRUPT_SMI);
|
2010-03-29 21:23:52 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-20 07:45:24 +02:00
|
|
|
/*
|
|
|
|
|
* This function is very similar to smp_parse()
|
|
|
|
|
* in hw/core/machine.c but includes CPU die support.
|
|
|
|
|
*/
|
2021-06-17 17:53:06 +02:00
|
|
|
static void pc_smp_parse(MachineState *ms, SMPConfiguration *config, Error **errp)
|
2019-06-20 07:45:24 +02:00
|
|
|
{
|
2021-06-17 17:53:06 +02:00
|
|
|
unsigned cpus = config->has_cpus ? config->cpus : 0;
|
|
|
|
|
unsigned sockets = config->has_sockets ? config->sockets : 0;
|
2021-09-29 04:58:03 +02:00
|
|
|
unsigned dies = config->has_dies ? config->dies : 0;
|
2021-06-17 17:53:06 +02:00
|
|
|
unsigned cores = config->has_cores ? config->cores : 0;
|
|
|
|
|
unsigned threads = config->has_threads ? config->threads : 0;
|
2021-09-29 04:58:03 +02:00
|
|
|
unsigned maxcpus = config->has_maxcpus ? config->maxcpus : 0;
|
|
|
|
|
|
|
|
|
|
/* directly default dies to 1 if it's omitted */
|
|
|
|
|
dies = dies > 0 ? dies : 1;
|
2021-06-17 17:53:04 +02:00
|
|
|
|
|
|
|
|
/* compute missing values, prefer sockets over cores over threads */
|
machine: Uniformly use maxcpus to calculate the omitted parameters
We are currently using maxcpus to calculate the omitted sockets
but using cpus to calculate the omitted cores/threads. This makes
cmdlines like:
-smp cpus=8,maxcpus=16
-smp cpus=8,cores=4,maxcpus=16
-smp cpus=8,threads=2,maxcpus=16
work fine but the ones like:
-smp cpus=8,sockets=2,maxcpus=16
-smp cpus=8,sockets=2,cores=4,maxcpus=16
-smp cpus=8,sockets=2,threads=2,maxcpus=16
break the sanity check.
Since we require for a valid config that the product of "sockets * cores
* threads" should equal to the maxcpus, we should uniformly use maxcpus
to calculate their omitted values.
Also the if-branch of "cpus == 0 || sockets == 0" was split into two
branches of "cpus == 0" and "sockets == 0" so that we can clearly read
that we are parsing the configuration with a preference on cpus over
sockets over cores over threads.
Note: change in this patch won't affect any existing working cmdlines
but improves consistency and allows more incomplete configs to be valid.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210929025816.21076-5-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2021-09-29 04:58:04 +02:00
|
|
|
maxcpus = maxcpus > 0 ? maxcpus : cpus;
|
|
|
|
|
|
|
|
|
|
if (cpus == 0) {
|
|
|
|
|
sockets = sockets > 0 ? sockets : 1;
|
2021-06-17 17:53:04 +02:00
|
|
|
cores = cores > 0 ? cores : 1;
|
|
|
|
|
threads = threads > 0 ? threads : 1;
|
machine: Uniformly use maxcpus to calculate the omitted parameters
We are currently using maxcpus to calculate the omitted sockets
but using cpus to calculate the omitted cores/threads. This makes
cmdlines like:
-smp cpus=8,maxcpus=16
-smp cpus=8,cores=4,maxcpus=16
-smp cpus=8,threads=2,maxcpus=16
work fine but the ones like:
-smp cpus=8,sockets=2,maxcpus=16
-smp cpus=8,sockets=2,cores=4,maxcpus=16
-smp cpus=8,sockets=2,threads=2,maxcpus=16
break the sanity check.
Since we require for a valid config that the product of "sockets * cores
* threads" should equal to the maxcpus, we should uniformly use maxcpus
to calculate their omitted values.
Also the if-branch of "cpus == 0 || sockets == 0" was split into two
branches of "cpus == 0" and "sockets == 0" so that we can clearly read
that we are parsing the configuration with a preference on cpus over
sockets over cores over threads.
Note: change in this patch won't affect any existing working cmdlines
but improves consistency and allows more incomplete configs to be valid.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210929025816.21076-5-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2021-09-29 04:58:04 +02:00
|
|
|
cpus = sockets * dies * cores * threads;
|
|
|
|
|
maxcpus = maxcpus > 0 ? maxcpus : cpus;
|
|
|
|
|
} else if (sockets == 0) {
|
|
|
|
|
cores = cores > 0 ? cores : 1;
|
|
|
|
|
threads = threads > 0 ? threads : 1;
|
|
|
|
|
sockets = maxcpus / (dies * cores * threads);
|
2021-06-17 17:53:04 +02:00
|
|
|
} else if (cores == 0) {
|
|
|
|
|
threads = threads > 0 ? threads : 1;
|
machine: Uniformly use maxcpus to calculate the omitted parameters
We are currently using maxcpus to calculate the omitted sockets
but using cpus to calculate the omitted cores/threads. This makes
cmdlines like:
-smp cpus=8,maxcpus=16
-smp cpus=8,cores=4,maxcpus=16
-smp cpus=8,threads=2,maxcpus=16
work fine but the ones like:
-smp cpus=8,sockets=2,maxcpus=16
-smp cpus=8,sockets=2,cores=4,maxcpus=16
-smp cpus=8,sockets=2,threads=2,maxcpus=16
break the sanity check.
Since we require for a valid config that the product of "sockets * cores
* threads" should equal to the maxcpus, we should uniformly use maxcpus
to calculate their omitted values.
Also the if-branch of "cpus == 0 || sockets == 0" was split into two
branches of "cpus == 0" and "sockets == 0" so that we can clearly read
that we are parsing the configuration with a preference on cpus over
sockets over cores over threads.
Note: change in this patch won't affect any existing working cmdlines
but improves consistency and allows more incomplete configs to be valid.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210929025816.21076-5-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2021-09-29 04:58:04 +02:00
|
|
|
cores = maxcpus / (sockets * dies * threads);
|
2021-06-17 17:53:04 +02:00
|
|
|
} else if (threads == 0) {
|
machine: Uniformly use maxcpus to calculate the omitted parameters
We are currently using maxcpus to calculate the omitted sockets
but using cpus to calculate the omitted cores/threads. This makes
cmdlines like:
-smp cpus=8,maxcpus=16
-smp cpus=8,cores=4,maxcpus=16
-smp cpus=8,threads=2,maxcpus=16
work fine but the ones like:
-smp cpus=8,sockets=2,maxcpus=16
-smp cpus=8,sockets=2,cores=4,maxcpus=16
-smp cpus=8,sockets=2,threads=2,maxcpus=16
break the sanity check.
Since we require for a valid config that the product of "sockets * cores
* threads" should equal to the maxcpus, we should uniformly use maxcpus
to calculate their omitted values.
Also the if-branch of "cpus == 0 || sockets == 0" was split into two
branches of "cpus == 0" and "sockets == 0" so that we can clearly read
that we are parsing the configuration with a preference on cpus over
sockets over cores over threads.
Note: change in this patch won't affect any existing working cmdlines
but improves consistency and allows more incomplete configs to be valid.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210929025816.21076-5-wangyanan55@huawei.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2021-09-29 04:58:04 +02:00
|
|
|
threads = maxcpus / (sockets * dies * cores);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sockets * dies * cores * threads < cpus) {
|
2021-06-17 17:53:05 +02:00
|
|
|
error_setg(errp, "cpu topology: "
|
|
|
|
|
"sockets (%u) * dies (%u) * cores (%u) * threads (%u) < "
|
|
|
|
|
"smp_cpus (%u)",
|
|
|
|
|
sockets, dies, cores, threads, cpus);
|
|
|
|
|
return;
|
2021-06-17 17:53:04 +02:00
|
|
|
}
|
2019-06-20 07:45:24 +02:00
|
|
|
|
2021-09-29 04:58:03 +02:00
|
|
|
if (maxcpus < cpus) {
|
2021-06-17 17:53:05 +02:00
|
|
|
error_setg(errp, "maxcpus must be equal to or greater than smp");
|
|
|
|
|
return;
|
2019-06-20 07:45:24 +02:00
|
|
|
}
|
|
|
|
|
|
2021-09-29 04:58:03 +02:00
|
|
|
if (sockets * dies * cores * threads != maxcpus) {
|
2021-06-17 17:53:05 +02:00
|
|
|
error_setg(errp, "Invalid CPU topology deprecated: "
|
|
|
|
|
"sockets (%u) * dies (%u) * cores (%u) * threads (%u) "
|
|
|
|
|
"!= maxcpus (%u)",
|
|
|
|
|
sockets, dies, cores, threads,
|
2021-09-29 04:58:03 +02:00
|
|
|
maxcpus);
|
2021-06-17 17:53:05 +02:00
|
|
|
return;
|
2019-06-20 07:45:24 +02:00
|
|
|
}
|
2021-06-17 17:53:04 +02:00
|
|
|
|
|
|
|
|
ms->smp.cpus = cpus;
|
|
|
|
|
ms->smp.sockets = sockets;
|
|
|
|
|
ms->smp.dies = dies;
|
2021-09-29 04:58:03 +02:00
|
|
|
ms->smp.cores = cores;
|
|
|
|
|
ms->smp.threads = threads;
|
|
|
|
|
ms->smp.max_cpus = maxcpus;
|
2019-06-20 07:45:24 +02:00
|
|
|
}
|
|
|
|
|
|
2013-05-30 11:57:26 +02:00
|
|
|
static
|
2015-12-11 19:42:23 +01:00
|
|
|
void pc_machine_done(Notifier *notifier, void *data)
|
2013-05-30 11:57:26 +02:00
|
|
|
{
|
2015-12-11 19:42:23 +01:00
|
|
|
PCMachineState *pcms = container_of(notifier,
|
|
|
|
|
PCMachineState, machine_done);
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2015-06-02 13:23:07 +02:00
|
|
|
|
2016-07-14 18:54:31 +02:00
|
|
|
/* set the number of CPUs */
|
2020-09-15 14:09:03 +02:00
|
|
|
x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
|
2016-07-14 18:54:31 +02:00
|
|
|
|
2020-11-19 02:48:34 +01:00
|
|
|
fw_cfg_add_extra_pci_roots(pcms->bus, x86ms->fw_cfg);
|
2015-06-02 13:23:07 +02:00
|
|
|
|
2015-12-11 19:42:28 +01:00
|
|
|
acpi_setup();
|
2019-10-22 09:39:50 +02:00
|
|
|
if (x86ms->fw_cfg) {
|
|
|
|
|
fw_cfg_build_smbios(MACHINE(pcms), x86ms->fw_cfg);
|
|
|
|
|
fw_cfg_build_feature_control(MACHINE(pcms), x86ms->fw_cfg);
|
2016-11-16 14:04:41 +01:00
|
|
|
/* update FW_CFG_NB_CPUS to account for -device added CPUs */
|
2019-10-22 09:39:50 +02:00
|
|
|
fw_cfg_modify_i16(x86ms->fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus);
|
2016-05-24 19:37:18 +02:00
|
|
|
}
|
2016-10-19 14:05:42 +02:00
|
|
|
|
|
|
|
|
|
2020-10-05 16:18:19 +02:00
|
|
|
if (x86ms->apic_id_limit > 255 && !xen_enabled() &&
|
|
|
|
|
!kvm_irqchip_in_kernel()) {
|
|
|
|
|
error_report("current -smp configuration requires kernel "
|
|
|
|
|
"irqchip support.");
|
|
|
|
|
exit(EXIT_FAILURE);
|
2016-10-19 14:05:42 +02:00
|
|
|
}
|
2013-05-30 11:57:26 +02:00
|
|
|
}
|
|
|
|
|
|
2015-12-11 19:42:33 +01:00
|
|
|
void pc_guest_info_init(PCMachineState *pcms)
|
2013-05-30 11:57:26 +02:00
|
|
|
{
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2013-07-24 17:56:09 +02:00
|
|
|
|
2020-09-22 22:19:22 +02:00
|
|
|
x86ms->apic_xrupt_override = true;
|
2015-12-11 19:42:23 +01:00
|
|
|
pcms->machine_done.notify = pc_machine_done;
|
|
|
|
|
qemu_add_machine_init_done_notifier(&pcms->machine_done);
|
2013-05-30 11:57:26 +02:00
|
|
|
}
|
|
|
|
|
|
2013-10-29 13:57:34 +01:00
|
|
|
/* setup pci memory address space mapping into system address space */
|
|
|
|
|
void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory,
|
|
|
|
|
MemoryRegion *pci_address_space)
|
2013-07-29 16:47:57 +02:00
|
|
|
{
|
2013-10-29 13:57:34 +01:00
|
|
|
/* Set to lower priority than RAM */
|
|
|
|
|
memory_region_add_subregion_overlap(system_memory, 0x0,
|
|
|
|
|
pci_address_space, -1);
|
2013-07-29 16:47:57 +02:00
|
|
|
}
|
|
|
|
|
|
2015-12-11 19:42:25 +01:00
|
|
|
void xen_load_linux(PCMachineState *pcms)
|
2014-07-07 08:34:35 +02:00
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
FWCfgState *fw_cfg;
|
2019-09-30 17:26:29 +02:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2014-07-07 08:34:35 +02:00
|
|
|
|
2015-08-07 21:55:53 +02:00
|
|
|
assert(MACHINE(pcms)->kernel_filename != NULL);
|
2014-07-07 08:34:35 +02:00
|
|
|
|
2016-02-19 19:20:26 +01:00
|
|
|
fw_cfg = fw_cfg_init_io(FW_CFG_IO_BASE);
|
2019-10-22 09:39:50 +02:00
|
|
|
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus);
|
2014-07-07 08:34:35 +02:00
|
|
|
rom_set_fw(fw_cfg);
|
|
|
|
|
|
2019-09-30 17:26:29 +02:00
|
|
|
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
|
|
|
|
pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled);
|
2014-07-07 08:34:35 +02:00
|
|
|
for (i = 0; i < nb_option_roms; i++) {
|
|
|
|
|
assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
|
2016-05-23 20:11:33 +02:00
|
|
|
!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
|
2019-01-18 13:01:42 +01:00
|
|
|
!strcmp(option_rom[i].name, "pvh.bin") ||
|
2014-07-07 08:34:35 +02:00
|
|
|
!strcmp(option_rom[i].name, "multiboot.bin"));
|
|
|
|
|
rom_add_option(option_rom[i].name, option_rom[i].bootindex);
|
|
|
|
|
}
|
2019-10-22 09:39:50 +02:00
|
|
|
x86ms->fw_cfg = fw_cfg;
|
2014-07-07 08:34:35 +02:00
|
|
|
}
|
|
|
|
|
|
2021-09-17 20:59:49 +02:00
|
|
|
#define PC_ROM_MIN_VGA 0xc0000
|
|
|
|
|
#define PC_ROM_MIN_OPTION 0xc8000
|
|
|
|
|
#define PC_ROM_MAX 0xe0000
|
|
|
|
|
#define PC_ROM_ALIGN 0x800
|
|
|
|
|
#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
|
|
|
|
|
|
2015-12-11 19:42:24 +01:00
|
|
|
void pc_memory_init(PCMachineState *pcms,
|
|
|
|
|
MemoryRegion *system_memory,
|
|
|
|
|
MemoryRegion *rom_memory,
|
|
|
|
|
MemoryRegion **ram_memory)
|
2004-03-14 13:20:30 +01:00
|
|
|
{
|
2012-02-22 08:18:51 +01:00
|
|
|
int linux_boot, i;
|
2020-02-19 17:09:17 +01:00
|
|
|
MemoryRegion *option_rom_mr;
|
2011-07-26 13:26:17 +02:00
|
|
|
MemoryRegion *ram_below_4g, *ram_above_4g;
|
2013-04-16 02:24:08 +02:00
|
|
|
FWCfgState *fw_cfg;
|
2015-08-07 21:55:50 +02:00
|
|
|
MachineState *machine = MACHINE(pcms);
|
2019-08-19 00:54:06 +02:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2015-12-01 23:58:06 +01:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2005-07-23 21:05:37 +02:00
|
|
|
|
2019-10-22 09:39:50 +02:00
|
|
|
assert(machine->ram_size == x86ms->below_4g_mem_size +
|
|
|
|
|
x86ms->above_4g_mem_size);
|
2014-06-10 13:15:17 +02:00
|
|
|
|
|
|
|
|
linux_boot = (machine->kernel_filename != NULL);
|
2004-03-14 13:20:30 +01:00
|
|
|
|
2020-02-19 17:09:17 +01:00
|
|
|
/*
|
|
|
|
|
* Split single memory region and use aliases to address portions of it,
|
|
|
|
|
* done for backwards compatibility with older qemus.
|
2011-07-26 13:26:17 +02:00
|
|
|
*/
|
2020-02-19 17:09:17 +01:00
|
|
|
*ram_memory = machine->ram;
|
2011-08-21 05:09:37 +02:00
|
|
|
ram_below_4g = g_malloc(sizeof(*ram_below_4g));
|
2020-02-19 17:09:17 +01:00
|
|
|
memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", machine->ram,
|
2019-10-22 09:39:50 +02:00
|
|
|
0, x86ms->below_4g_mem_size);
|
2011-07-26 13:26:17 +02:00
|
|
|
memory_region_add_subregion(system_memory, 0, ram_below_4g);
|
2019-10-22 09:39:50 +02:00
|
|
|
e820_add_entry(0, x86ms->below_4g_mem_size, E820_RAM);
|
|
|
|
|
if (x86ms->above_4g_mem_size > 0) {
|
2011-08-21 05:09:37 +02:00
|
|
|
ram_above_4g = g_malloc(sizeof(*ram_above_4g));
|
2020-02-19 17:09:17 +01:00
|
|
|
memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g",
|
|
|
|
|
machine->ram,
|
2019-10-22 09:39:50 +02:00
|
|
|
x86ms->below_4g_mem_size,
|
|
|
|
|
x86ms->above_4g_mem_size);
|
2011-07-26 13:26:17 +02:00
|
|
|
memory_region_add_subregion(system_memory, 0x100000000ULL,
|
|
|
|
|
ram_above_4g);
|
2019-10-22 09:39:50 +02:00
|
|
|
e820_add_entry(0x100000000ULL, x86ms->above_4g_mem_size, E820_RAM);
|
2010-07-06 18:37:17 +02:00
|
|
|
}
|
2008-09-15 18:01:01 +02:00
|
|
|
|
2021-07-19 13:21:21 +02:00
|
|
|
if (pcms->sgx_epc.size != 0) {
|
|
|
|
|
e820_add_entry(pcms->sgx_epc.base, pcms->sgx_epc.size, E820_RESERVED);
|
|
|
|
|
}
|
|
|
|
|
|
2015-12-11 19:42:28 +01:00
|
|
|
if (!pcmc->has_reserved_memory &&
|
2014-06-02 15:25:11 +02:00
|
|
|
(machine->ram_slots ||
|
2014-06-10 13:15:17 +02:00
|
|
|
(machine->maxram_size > machine->ram_size))) {
|
2014-06-02 15:25:11 +02:00
|
|
|
|
|
|
|
|
error_report("\"-memory 'slots|maxmem'\" is not supported by: %s",
|
|
|
|
|
mc->name);
|
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-23 18:51:17 +02:00
|
|
|
/* always allocate the device memory information */
|
|
|
|
|
machine->device_memory = g_malloc0(sizeof(*machine->device_memory));
|
|
|
|
|
|
2018-04-23 18:51:24 +02:00
|
|
|
/* initialize device memory address space */
|
2015-12-11 19:42:28 +01:00
|
|
|
if (pcmc->has_reserved_memory &&
|
2014-06-10 13:15:17 +02:00
|
|
|
(machine->ram_size < machine->maxram_size)) {
|
2018-04-23 18:51:24 +02:00
|
|
|
ram_addr_t device_mem_size = machine->maxram_size - machine->ram_size;
|
2014-06-02 15:25:08 +02:00
|
|
|
|
2014-06-02 15:25:09 +02:00
|
|
|
if (machine->ram_slots > ACPI_MAX_RAM_SLOTS) {
|
|
|
|
|
error_report("unsupported amount of memory slots: %"PRIu64,
|
|
|
|
|
machine->ram_slots);
|
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-29 14:48:41 +01:00
|
|
|
if (QEMU_ALIGN_UP(machine->maxram_size,
|
|
|
|
|
TARGET_PAGE_SIZE) != machine->maxram_size) {
|
|
|
|
|
error_report("maximum memory size must by aligned to multiple of "
|
|
|
|
|
"%d bytes", TARGET_PAGE_SIZE);
|
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-19 13:21:20 +02:00
|
|
|
if (pcms->sgx_epc.size != 0) {
|
|
|
|
|
machine->device_memory->base = sgx_epc_above_4g_end(&pcms->sgx_epc);
|
|
|
|
|
} else {
|
|
|
|
|
machine->device_memory->base =
|
|
|
|
|
0x100000000ULL + x86ms->above_4g_mem_size;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-23 18:51:17 +02:00
|
|
|
machine->device_memory->base =
|
2021-07-19 13:21:20 +02:00
|
|
|
ROUND_UP(machine->device_memory->base, 1 * GiB);
|
2014-06-02 15:25:08 +02:00
|
|
|
|
2015-12-01 23:58:06 +01:00
|
|
|
if (pcmc->enforce_aligned_dimm) {
|
2018-04-23 18:51:24 +02:00
|
|
|
/* size device region assuming 1G page max alignment per slot */
|
2018-06-29 16:22:13 +02:00
|
|
|
device_mem_size += (1 * GiB) * machine->ram_slots;
|
pc: count in 1Gb hugepage alignment when sizing hotplug-memory container
if DIMMs with different size/alignment are interleaved
in creation order, it could lead to hotplug-memory
container fragmentation and following inability to use
all RAM upto maxmem.
For example:
-m 4G,slots=3,maxmem=7G
-object memory-backend-file,id=mem-1,size=256M,mem-path=/pagesize-2MB
-device pc-dimm,id=mem1,memdev=mem-1
-object memory-backend-file,id=mem-2,size=1G,mem-path=/pagesize-1GB
-device pc-dimm,id=mem2,memdev=mem-2
-object memory-backend-file,id=mem-3,size=256M,mem-path=/pagesize-2MB
-device pc-dimm,id=mem3,memdev=mem-3
fragments hotplug-memory container and doesn't allow
to use 1GB hugepage backend to consume remainig 1Gb.
To ease managment factor count in max 1Gb alignment for
each memory slot when sizing hotplug-memory region so
that regadless of fragmentaion it would be possible to
add max aligned DIMM.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2014-10-31 17:38:42 +01:00
|
|
|
}
|
|
|
|
|
|
2018-04-23 18:51:24 +02:00
|
|
|
if ((machine->device_memory->base + device_mem_size) <
|
|
|
|
|
device_mem_size) {
|
2014-06-02 15:25:08 +02:00
|
|
|
error_report("unsupported amount of maximum memory: " RAM_ADDR_FMT,
|
|
|
|
|
machine->maxram_size);
|
|
|
|
|
exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-23 18:51:17 +02:00
|
|
|
memory_region_init(&machine->device_memory->mr, OBJECT(pcms),
|
2018-04-23 18:51:24 +02:00
|
|
|
"device-memory", device_mem_size);
|
2018-04-23 18:51:17 +02:00
|
|
|
memory_region_add_subregion(system_memory, machine->device_memory->base,
|
|
|
|
|
&machine->device_memory->mr);
|
2014-06-02 15:25:08 +02:00
|
|
|
}
|
2012-02-22 08:18:51 +01:00
|
|
|
|
|
|
|
|
/* Initialize PC system firmware */
|
2019-03-08 14:14:43 +01:00
|
|
|
pc_system_firmware_init(pcms, rom_memory);
|
2011-07-26 13:26:17 +02:00
|
|
|
|
2011-08-21 05:09:37 +02:00
|
|
|
option_rom_mr = g_malloc(sizeof(*option_rom_mr));
|
2017-07-07 16:42:53 +02:00
|
|
|
memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
|
Fix bad error handling after memory_region_init_ram()
Symptom:
$ qemu-system-x86_64 -m 10000000
Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions. Before the commit, we report the error and exit(1), in
one place, ram_block_add(). The commit lifts the error handling up
the call chain some, to three places. Fine. Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
Commit 4994653 (right after commit ef701d7) lifted the error
handling further, through memory_region_init_ram(), multiplying the
incorrect use of &error_abort. Later on, imitation of existing
(bad) code may have created more.
* memory_region_init_ram_ptr()
The &error_abort is still there.
* memory_region_init_rom_device()
Doesn't need fixing, because commit 33e0eb5 (soon after commit
ef701d7) lifted the error handling further, and in the process
changed it from &error_abort to passing it up the call chain.
Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
@r@
expression mr, owner, name, size, err;
position p;
@@
memory_region_init_ram(mr, owner, name, size,
(
- &error_abort
+ &error_fatal
|
err@p
)
);
@script:python@
p << r.p;
@@
print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal. This is the fix.
If the last argument is anything else, its position is reported. This
lets us check the fix is complete. Four positions get reported:
* ram_backend_memory_alloc()
Error is passed up the call chain, ultimately through
user_creatable_complete(). As far as I can tell, it's callers all
handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
DeviceClass.realize() methods, errors handled sanely further up the
call chain.
We're good. Test case again behaves:
$ qemu-system-x86_64 -m 10000000
qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
[Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
2015-09-11 16:51:43 +02:00
|
|
|
&error_fatal);
|
pc: make 'pc.rom' readonly when machine has PCI enabled
looking at bios ROM mapping in QEMU it seems that only isapc
(i.e. not PCI enabled machine) requires ROM being mapped as
RW in other cases BIOS is mapped as RO. Do the same for option
ROM 'pc.rom' when machine has PCI enabled.
As useful side-effect pc.rom MemoryRegion stops being
put in vhost memory map (filtered out by vhost_section()),
which reduces number of entries by 1.
Coincidentally it fixes migration failure reported in
"[PATCH V2] vhost: fix a migration failed because of vhost region merge"
where following destination CLI with /sys/module/vhost/parameters/max_mem_regions = 8
export DIMMSCOUNT=6
QEMU -enable-kvm \
-netdev type=tap,id=guest0,vhost=on,script=no,vhostforce \
-device virtio-net-pci,netdev=guest0 \
-m 256,slots=256,maxmem=2G \
`i=0; while [ $i -lt $DIMMSCOUNT ]; do echo \
"-object memory-backend-ram,id=m$i,size=128M \
-device pc-dimm,id=d$i,memdev=m$i"; i=$(($i + 1)); \
done`
will fail to startup with error:
"-device pc-dimm,id=d5,memdev=m5: a used vhost backend has no free memory slots left"
while it's possible to add the 6th DIMM during hotplug
on source.
Issue is caused by the fact that number of entries in vhost map
is bigger on 1 entry, when -device is processed, than
after guest boots up, and that offending entry belongs to
'pc.rom', it's not like vhost intends to do IO in ROM range
so making it RO hides region from vhost and makes number
of entries in vhost memory map at -device/machine_done time
match number of entries after guest boots.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reported-by: Peng Hao <peng.hao2@zte.com.cn>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2017-07-28 11:09:05 +02:00
|
|
|
if (pcmc->pci_enabled) {
|
|
|
|
|
memory_region_set_readonly(option_rom_mr, true);
|
|
|
|
|
}
|
2011-09-21 20:49:29 +02:00
|
|
|
memory_region_add_subregion_overlap(rom_memory,
|
2011-07-26 13:26:17 +02:00
|
|
|
PC_ROM_MIN_VGA,
|
|
|
|
|
option_rom_mr,
|
|
|
|
|
1);
|
2009-04-09 22:59:05 +02:00
|
|
|
|
2019-09-16 12:42:42 +02:00
|
|
|
fw_cfg = fw_cfg_arch_create(machine,
|
2019-10-22 09:39:50 +02:00
|
|
|
x86ms->boot_cpus, x86ms->apic_id_limit);
|
2015-10-08 17:02:57 +02:00
|
|
|
|
2010-01-08 15:25:40 +01:00
|
|
|
rom_set_fw(fw_cfg);
|
2009-06-29 15:37:37 +02:00
|
|
|
|
2018-04-23 18:51:17 +02:00
|
|
|
if (pcmc->has_reserved_memory && machine->device_memory->base) {
|
2014-06-02 15:25:10 +02:00
|
|
|
uint64_t *val = g_malloc(sizeof(*val));
|
2015-09-07 13:55:32 +02:00
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2018-04-23 18:51:17 +02:00
|
|
|
uint64_t res_mem_end = machine->device_memory->base;
|
2015-09-07 13:55:32 +02:00
|
|
|
|
|
|
|
|
if (!pcmc->broken_reserved_end) {
|
2018-04-23 18:51:17 +02:00
|
|
|
res_mem_end += memory_region_size(&machine->device_memory->mr);
|
2015-09-07 13:55:32 +02:00
|
|
|
}
|
2018-06-29 16:22:13 +02:00
|
|
|
*val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB));
|
2014-06-02 15:25:10 +02:00
|
|
|
fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val));
|
|
|
|
|
}
|
|
|
|
|
|
2009-04-09 22:59:05 +02:00
|
|
|
if (linux_boot) {
|
2019-09-30 17:26:29 +02:00
|
|
|
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
|
|
|
|
pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled);
|
2009-04-09 22:59:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < nb_option_roms; i++) {
|
2010-12-08 12:35:07 +01:00
|
|
|
rom_add_option(option_rom[i].name, option_rom[i].bootindex);
|
2009-06-17 15:05:30 +02:00
|
|
|
}
|
2019-10-22 09:39:50 +02:00
|
|
|
x86ms->fw_cfg = fw_cfg;
|
2016-07-14 07:56:23 +02:00
|
|
|
|
|
|
|
|
/* Init default IOAPIC address space */
|
2019-10-22 09:39:50 +02:00
|
|
|
x86ms->ioapic_as = &address_space_memory;
|
2019-09-18 15:06:23 +02:00
|
|
|
|
|
|
|
|
/* Init ACPI memory hotplug IO base address */
|
|
|
|
|
pcms->memhp_io_base = ACPI_MEMORY_HOTPLUG_BASE;
|
2010-05-14 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
2017-11-11 16:25:00 +01:00
|
|
|
/*
|
|
|
|
|
* The 64bit pci hole starts after "above 4G RAM" and
|
|
|
|
|
* potentially the space reserved for memory hotplug.
|
|
|
|
|
*/
|
|
|
|
|
uint64_t pc_pci_hole64_start(void)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(qdev_get_machine());
|
|
|
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2018-04-23 18:51:17 +02:00
|
|
|
MachineState *ms = MACHINE(pcms);
|
2019-10-22 09:39:50 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(pcms);
|
2017-11-11 16:25:00 +01:00
|
|
|
uint64_t hole64_start = 0;
|
|
|
|
|
|
2018-04-23 18:51:17 +02:00
|
|
|
if (pcmc->has_reserved_memory && ms->device_memory->base) {
|
|
|
|
|
hole64_start = ms->device_memory->base;
|
2017-11-11 16:25:00 +01:00
|
|
|
if (!pcmc->broken_reserved_end) {
|
2018-04-23 18:51:17 +02:00
|
|
|
hole64_start += memory_region_size(&ms->device_memory->mr);
|
2017-11-11 16:25:00 +01:00
|
|
|
}
|
2021-07-19 13:21:20 +02:00
|
|
|
} else if (pcms->sgx_epc.size != 0) {
|
|
|
|
|
hole64_start = sgx_epc_above_4g_end(&pcms->sgx_epc);
|
2017-11-11 16:25:00 +01:00
|
|
|
} else {
|
2019-10-22 09:39:50 +02:00
|
|
|
hole64_start = 0x100000000ULL + x86ms->above_4g_mem_size;
|
2017-11-11 16:25:00 +01:00
|
|
|
}
|
|
|
|
|
|
2018-06-29 16:22:13 +02:00
|
|
|
return ROUND_UP(hole64_start, 1 * GiB);
|
2017-11-11 16:25:00 +01:00
|
|
|
}
|
|
|
|
|
|
2011-12-15 22:09:51 +01:00
|
|
|
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
|
2010-05-14 09:29:12 +02:00
|
|
|
{
|
2011-12-12 21:29:41 +01:00
|
|
|
DeviceState *dev = NULL;
|
|
|
|
|
|
2016-04-07 16:12:58 +02:00
|
|
|
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA);
|
2012-09-08 12:47:45 +02:00
|
|
|
if (pci_bus) {
|
|
|
|
|
PCIDevice *pcidev = pci_vga_init(pci_bus);
|
|
|
|
|
dev = pcidev ? &pcidev->qdev : NULL;
|
|
|
|
|
} else if (isa_bus) {
|
|
|
|
|
ISADevice *isadev = isa_vga_init(isa_bus);
|
2013-06-07 13:49:13 +02:00
|
|
|
dev = isadev ? DEVICE(isadev) : NULL;
|
2010-05-14 09:29:12 +02:00
|
|
|
}
|
2016-04-07 16:12:58 +02:00
|
|
|
rom_reset_order_override();
|
2011-12-12 21:29:41 +01:00
|
|
|
return dev;
|
2010-05-14 09:29:12 +02:00
|
|
|
}
|
|
|
|
|
|
2012-09-19 13:50:08 +02:00
|
|
|
static const MemoryRegionOps ioport80_io_ops = {
|
|
|
|
|
.write = ioport80_write,
|
2013-01-09 19:10:22 +01:00
|
|
|
.read = ioport80_read,
|
2012-09-19 13:50:08 +02:00
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
|
|
|
.impl = {
|
|
|
|
|
.min_access_size = 1,
|
|
|
|
|
.max_access_size = 1,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const MemoryRegionOps ioportF0_io_ops = {
|
|
|
|
|
.write = ioportF0_write,
|
2013-01-09 19:10:22 +01:00
|
|
|
.read = ioportF0_read,
|
2012-09-19 13:50:08 +02:00
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
|
|
|
.impl = {
|
|
|
|
|
.min_access_size = 1,
|
|
|
|
|
.max_access_size = 1,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
2018-03-08 23:39:46 +01:00
|
|
|
static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
DriveInfo *fd[MAX_FD];
|
|
|
|
|
qemu_irq *a20_line;
|
2020-06-22 11:42:16 +02:00
|
|
|
ISADevice *fdc, *i8042, *port92, *vmmouse;
|
2018-03-08 23:39:46 +01:00
|
|
|
|
2018-04-20 16:52:46 +02:00
|
|
|
serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS);
|
2018-03-08 23:39:46 +01:00
|
|
|
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_FD; i++) {
|
|
|
|
|
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
|
|
|
|
create_fdctrl |= !!fd[i];
|
|
|
|
|
}
|
|
|
|
|
if (create_fdctrl) {
|
2020-06-22 11:42:16 +02:00
|
|
|
fdc = isa_new(TYPE_ISA_FDC);
|
|
|
|
|
if (fdc) {
|
|
|
|
|
isa_realize_and_unref(fdc, isa_bus, &error_fatal);
|
|
|
|
|
isa_fdc_init_drives(fdc, fd);
|
|
|
|
|
}
|
2018-03-08 23:39:46 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i8042 = isa_create_simple(isa_bus, "i8042");
|
|
|
|
|
if (!no_vmport) {
|
2020-05-04 10:33:39 +02:00
|
|
|
isa_create_simple(isa_bus, TYPE_VMPORT);
|
2020-06-10 07:32:09 +02:00
|
|
|
vmmouse = isa_try_new("vmmouse");
|
2018-03-08 23:39:46 +01:00
|
|
|
} else {
|
|
|
|
|
vmmouse = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (vmmouse) {
|
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 18:05:54 +02:00
|
|
|
object_property_set_link(OBJECT(vmmouse), "i8042", OBJECT(i8042),
|
|
|
|
|
&error_abort);
|
2020-06-10 07:32:09 +02:00
|
|
|
isa_realize_and_unref(vmmouse, isa_bus, &error_fatal);
|
2018-03-08 23:39:46 +01:00
|
|
|
}
|
2019-12-13 11:50:58 +01:00
|
|
|
port92 = isa_create_simple(isa_bus, TYPE_PORT92);
|
2018-03-08 23:39:46 +01:00
|
|
|
|
|
|
|
|
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
|
|
|
|
|
i8042_setup_a20_line(i8042, a20_line[0]);
|
2019-12-13 11:50:59 +01:00
|
|
|
qdev_connect_gpio_out_named(DEVICE(port92),
|
|
|
|
|
PORT92_A20_LINE, 0, a20_line[1]);
|
2018-03-08 23:39:46 +01:00
|
|
|
g_free(a20_line);
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-02 15:25:16 +02:00
|
|
|
void pc_basic_device_init(struct PCMachineState *pcms,
|
|
|
|
|
ISABus *isa_bus, qemu_irq *gsi,
|
2011-05-03 18:06:54 +02:00
|
|
|
ISADevice **rtc_state,
|
2015-05-28 22:04:08 +02:00
|
|
|
bool create_fdctrl,
|
2016-01-22 16:09:21 +01:00
|
|
|
uint32_t hpet_irqs)
|
2010-05-14 09:29:13 +02:00
|
|
|
{
|
|
|
|
|
int i;
|
2012-02-01 20:31:41 +01:00
|
|
|
DeviceState *hpet = NULL;
|
|
|
|
|
int pit_isa_irq = 0;
|
|
|
|
|
qemu_irq pit_alt_irq = NULL;
|
2010-06-13 14:15:40 +02:00
|
|
|
qemu_irq rtc_irq = NULL;
|
2018-03-08 23:39:46 +01:00
|
|
|
ISADevice *pit = NULL;
|
2012-09-19 13:50:08 +02:00
|
|
|
MemoryRegion *ioport80_io = g_new(MemoryRegion, 1);
|
|
|
|
|
MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1);
|
2010-05-14 09:29:13 +02:00
|
|
|
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1);
|
2012-09-19 13:50:08 +02:00
|
|
|
memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io);
|
2010-05-14 09:29:13 +02:00
|
|
|
|
2013-06-06 11:41:28 +02:00
|
|
|
memory_region_init_io(ioportF0_io, NULL, &ioportF0_io_ops, NULL, "ioportF0", 1);
|
2012-09-19 13:50:08 +02:00
|
|
|
memory_region_add_subregion(isa_bus->address_space_io, 0xf0, ioportF0_io);
|
2010-05-14 09:29:13 +02:00
|
|
|
|
2012-03-02 20:28:49 +01:00
|
|
|
/*
|
|
|
|
|
* Check if an HPET shall be created.
|
|
|
|
|
*
|
|
|
|
|
* Without KVM_CAP_PIT_STATE2, we cannot switch off the in-kernel PIT
|
|
|
|
|
* when the HPET wants to take over. Thus we have to disable the latter.
|
|
|
|
|
*/
|
2020-10-21 16:47:16 +02:00
|
|
|
if (pcms->hpet_enabled && (!kvm_irqchip_in_kernel() ||
|
|
|
|
|
kvm_has_pit_state2())) {
|
2020-06-10 07:31:59 +02:00
|
|
|
hpet = qdev_try_new(TYPE_HPET);
|
2020-10-21 16:47:16 +02:00
|
|
|
if (!hpet) {
|
|
|
|
|
error_report("couldn't create HPET device");
|
|
|
|
|
exit(1);
|
|
|
|
|
}
|
2020-11-02 11:09:19 +01:00
|
|
|
/*
|
|
|
|
|
* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7 and
|
|
|
|
|
* earlier, use IRQ2 for compat. Otherwise, use IRQ16~23, IRQ8 and
|
|
|
|
|
* IRQ2.
|
|
|
|
|
*/
|
2020-10-21 16:47:16 +02:00
|
|
|
uint8_t compat = object_property_get_uint(OBJECT(hpet),
|
|
|
|
|
HPET_INTCAP, NULL);
|
|
|
|
|
if (!compat) {
|
|
|
|
|
qdev_prop_set_uint32(hpet, HPET_INTCAP, hpet_irqs);
|
|
|
|
|
}
|
|
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(hpet), &error_fatal);
|
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(hpet), 0, HPET_BASE);
|
2013-12-08 10:38:17 +01:00
|
|
|
|
2020-10-21 16:47:16 +02:00
|
|
|
for (i = 0; i < GSI_NUM_PINS; i++) {
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(hpet), i, gsi[i]);
|
2010-06-13 14:15:38 +02:00
|
|
|
}
|
2020-10-21 16:47:16 +02:00
|
|
|
pit_isa_irq = -1;
|
|
|
|
|
pit_alt_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_PIT_INT);
|
|
|
|
|
rtc_irq = qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT);
|
2010-05-14 09:29:13 +02:00
|
|
|
}
|
2017-10-17 18:44:16 +02:00
|
|
|
*rtc_state = mc146818_rtc_init(isa_bus, 2000, rtc_irq);
|
2010-06-13 14:15:40 +02:00
|
|
|
|
|
|
|
|
qemu_register_boot_set(pc_boot_set, *rtc_state);
|
|
|
|
|
|
2020-07-02 15:25:17 +02:00
|
|
|
if (!xen_enabled() && pcms->pit_enabled) {
|
2015-12-17 17:16:08 +01:00
|
|
|
if (kvm_pit_in_kernel()) {
|
2011-11-14 16:07:01 +01:00
|
|
|
pit = kvm_pit_init(isa_bus, 0x40);
|
|
|
|
|
} else {
|
2017-10-17 18:44:15 +02:00
|
|
|
pit = i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq);
|
2011-11-14 16:07:01 +01:00
|
|
|
}
|
|
|
|
|
if (hpet) {
|
|
|
|
|
/* connect PIT to output control line of the HPET */
|
2013-06-07 13:49:13 +02:00
|
|
|
qdev_connect_gpio_out(hpet, 0, qdev_get_gpio_in(DEVICE(pit), 0));
|
2011-11-14 16:07:01 +01:00
|
|
|
}
|
2020-07-02 15:25:21 +02:00
|
|
|
pcspk_init(pcms->pcspk, isa_bus, pit);
|
2012-02-01 20:31:41 +01:00
|
|
|
}
|
2010-05-14 09:29:13 +02:00
|
|
|
|
2018-03-08 23:39:23 +01:00
|
|
|
i8257_dma_init(isa_bus, 0);
|
2010-05-14 09:29:13 +02:00
|
|
|
|
2018-03-08 23:39:46 +01:00
|
|
|
/* Super I/O */
|
2020-07-02 15:25:18 +02:00
|
|
|
pc_superio_init(isa_bus, create_fdctrl, pcms->vmport != ON_OFF_AUTO_ON);
|
2010-05-14 09:29:13 +02:00
|
|
|
}
|
|
|
|
|
|
2018-03-02 10:29:06 +01:00
|
|
|
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
|
2012-11-14 21:54:01 +01:00
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2016-04-07 16:12:58 +02:00
|
|
|
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
|
2012-11-14 21:54:01 +01:00
|
|
|
for (i = 0; i < nb_nics; i++) {
|
|
|
|
|
NICInfo *nd = &nd_table[i];
|
2018-03-02 10:29:06 +01:00
|
|
|
const char *model = nd->model ? nd->model : pcmc->default_nic_model;
|
2012-11-14 21:54:01 +01:00
|
|
|
|
2018-03-02 10:29:06 +01:00
|
|
|
if (g_str_equal(model, "ne2k_isa")) {
|
2012-11-14 21:54:01 +01:00
|
|
|
pc_init_ne2k_isa(isa_bus, nd);
|
|
|
|
|
} else {
|
2018-03-02 10:29:06 +01:00
|
|
|
pci_nic_init_nofail(nd, pci_bus, model, NULL);
|
2012-11-14 21:54:01 +01:00
|
|
|
}
|
|
|
|
|
}
|
2016-04-07 16:12:58 +02:00
|
|
|
rom_reset_order_override();
|
2012-11-14 21:54:01 +01:00
|
|
|
}
|
|
|
|
|
|
2019-10-18 15:59:09 +02:00
|
|
|
void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs)
|
|
|
|
|
{
|
|
|
|
|
qemu_irq *i8259;
|
|
|
|
|
|
|
|
|
|
if (kvm_pic_in_kernel()) {
|
|
|
|
|
i8259 = kvm_i8259_init(isa_bus);
|
|
|
|
|
} else if (xen_enabled()) {
|
|
|
|
|
i8259 = xen_interrupt_controller_init();
|
|
|
|
|
} else {
|
2019-12-12 14:14:40 +01:00
|
|
|
i8259 = i8259_init(isa_bus, x86_allocate_cpu_irq());
|
2019-10-18 15:59:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < ISA_NUM_IRQS; i++) {
|
|
|
|
|
i8259_irqs[i] = i8259[i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
g_free(i8259);
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-19 15:41:34 +02:00
|
|
|
static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
const PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
2020-09-15 14:09:02 +02:00
|
|
|
const X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
|
2018-08-01 15:34:44 +02:00
|
|
|
const PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
2019-03-08 19:20:53 +01:00
|
|
|
const MachineState *ms = MACHINE(hotplug_dev);
|
2018-06-19 15:41:34 +02:00
|
|
|
const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
|
2018-08-01 15:34:44 +02:00
|
|
|
const uint64_t legacy_align = TARGET_PAGE_SIZE;
|
2019-04-07 11:23:14 +02:00
|
|
|
Error *local_err = NULL;
|
2018-06-19 15:41:34 +02:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* When -no-acpi is used with Q35 machine type, no ACPI is built,
|
|
|
|
|
* but pcms->acpi_dev is still created. Check !acpi_enabled in
|
|
|
|
|
* addition to cover this case.
|
|
|
|
|
*/
|
2020-09-15 14:09:02 +02:00
|
|
|
if (!x86ms->acpi_dev || !x86_machine_is_acpi_enabled(x86ms)) {
|
2018-06-19 15:41:34 +02:00
|
|
|
error_setg(errp,
|
|
|
|
|
"memory hotplug is not enabled: missing acpi device or acpi disabled");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-08 19:20:53 +01:00
|
|
|
if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
|
2018-06-19 15:41:34 +02:00
|
|
|
error_setg(errp, "nvdimm is not enabled: missing 'nvdimm' in '-M'");
|
|
|
|
|
return;
|
|
|
|
|
}
|
2018-08-01 15:34:41 +02:00
|
|
|
|
2020-09-15 14:09:02 +02:00
|
|
|
hotplug_handler_pre_plug(x86ms->acpi_dev, dev, &local_err);
|
2019-04-07 11:23:14 +02:00
|
|
|
if (local_err) {
|
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-05 11:20:12 +02:00
|
|
|
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev),
|
2018-08-01 15:34:44 +02:00
|
|
|
pcmc->enforce_aligned_dimm ? NULL : &legacy_align, errp);
|
2018-06-19 15:41:34 +02:00
|
|
|
}
|
|
|
|
|
|
2018-06-19 15:41:31 +02:00
|
|
|
static void pc_memory_plug(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2014-06-02 15:25:12 +02:00
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
2020-09-15 14:09:02 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
|
2019-03-08 19:20:53 +01:00
|
|
|
MachineState *ms = MACHINE(hotplug_dev);
|
hw/i386: fix nvdimm check error path
Commit e987c37aee1752177906847630d32477da57e705 ("hw/i386: check if
nvdimm is enabled before plugging") introduced a check to reject nvdimm
hotplug if -machine pc,nvdimm=on was not given.
This check executes after pc_dimm_memory_plug() has already completed
and does not reverse the effect of this function in the case of failure.
Perform the check before calling pc_dimm_memory_plug(). This fixes the
following abort:
$ qemu -M accel=kvm -m 1G,slots=4,maxmem=8G \
-object memory-backend-file,id=mem1,share=on,mem-path=nvdimm.dat,size=1G
(qemu) device_add nvdimm,memdev=mem1
nvdimm is not enabled: missing 'nvdimm' in '-M'
(qemu) device_add nvdimm,memdev=mem1
Core dumped
The backtrace is:
#0 0x00007fffdb5b191f in raise () at /lib64/libc.so.6
#1 0x00007fffdb5b351a in abort () at /lib64/libc.so.6
#2 0x00007fffdb5a9da7 in __assert_fail_base () at /lib64/libc.so.6
#3 0x00007fffdb5a9e52 in () at /lib64/libc.so.6
#4 0x000055555577a5fa in qemu_ram_set_idstr (new_block=0x555556747a00, name=<optimized out>, dev=dev@entry=0x555556705590) at qemu/exec.c:1709
#5 0x0000555555a0fe86 in vmstate_register_ram (mr=mr@entry=0x55555673a0e0, dev=dev@entry=0x555556705590) at migration/savevm.c:2293
#6 0x0000555555965088 in pc_dimm_memory_plug (dev=dev@entry=0x555556705590, hpms=hpms@entry=0x5555566bb0e0, mr=mr@entry=0x555556705630, align=<optimized out>, errp=errp@entry=0x7fffffffc660)
at hw/mem/pc-dimm.c:110
#7 0x000055555581d89b in pc_dimm_plug (errp=0x7fffffffc6c0, dev=0x555556705590, hotplug_dev=<optimized out>) at qemu/hw/i386/pc.c:1713
#8 0x000055555581d89b in pc_machine_device_plug_cb (hotplug_dev=<optimized out>, dev=0x555556705590, errp=0x7fffffffc6c0) at qemu/hw/i386/pc.c:2004
#9 0x0000555555914da6 in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffc7e8) at hw/core/qdev.c:926
Cc: Haozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Haozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2017-06-09 17:16:15 +02:00
|
|
|
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
|
2014-06-02 15:25:12 +02:00
|
|
|
|
2020-10-19 10:48:04 +02:00
|
|
|
pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms));
|
2014-10-31 17:38:32 +01:00
|
|
|
|
hw/i386: fix nvdimm check error path
Commit e987c37aee1752177906847630d32477da57e705 ("hw/i386: check if
nvdimm is enabled before plugging") introduced a check to reject nvdimm
hotplug if -machine pc,nvdimm=on was not given.
This check executes after pc_dimm_memory_plug() has already completed
and does not reverse the effect of this function in the case of failure.
Perform the check before calling pc_dimm_memory_plug(). This fixes the
following abort:
$ qemu -M accel=kvm -m 1G,slots=4,maxmem=8G \
-object memory-backend-file,id=mem1,share=on,mem-path=nvdimm.dat,size=1G
(qemu) device_add nvdimm,memdev=mem1
nvdimm is not enabled: missing 'nvdimm' in '-M'
(qemu) device_add nvdimm,memdev=mem1
Core dumped
The backtrace is:
#0 0x00007fffdb5b191f in raise () at /lib64/libc.so.6
#1 0x00007fffdb5b351a in abort () at /lib64/libc.so.6
#2 0x00007fffdb5a9da7 in __assert_fail_base () at /lib64/libc.so.6
#3 0x00007fffdb5a9e52 in () at /lib64/libc.so.6
#4 0x000055555577a5fa in qemu_ram_set_idstr (new_block=0x555556747a00, name=<optimized out>, dev=dev@entry=0x555556705590) at qemu/exec.c:1709
#5 0x0000555555a0fe86 in vmstate_register_ram (mr=mr@entry=0x55555673a0e0, dev=dev@entry=0x555556705590) at migration/savevm.c:2293
#6 0x0000555555965088 in pc_dimm_memory_plug (dev=dev@entry=0x555556705590, hpms=hpms@entry=0x5555566bb0e0, mr=mr@entry=0x555556705630, align=<optimized out>, errp=errp@entry=0x7fffffffc660)
at hw/mem/pc-dimm.c:110
#7 0x000055555581d89b in pc_dimm_plug (errp=0x7fffffffc6c0, dev=0x555556705590, hotplug_dev=<optimized out>) at qemu/hw/i386/pc.c:1713
#8 0x000055555581d89b in pc_machine_device_plug_cb (hotplug_dev=<optimized out>, dev=0x555556705590, errp=0x7fffffffc6c0) at qemu/hw/i386/pc.c:2004
#9 0x0000555555914da6 in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffc7e8) at hw/core/qdev.c:926
Cc: Haozhong Zhang <haozhong.zhang@intel.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Haozhong Zhang <haozhong.zhang@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2017-06-09 17:16:15 +02:00
|
|
|
if (is_nvdimm) {
|
2019-03-08 19:20:53 +01:00
|
|
|
nvdimm_plug(ms->nvdimms_state);
|
2016-11-07 12:13:36 +01:00
|
|
|
}
|
|
|
|
|
|
2020-09-15 14:09:02 +02:00
|
|
|
hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort);
|
2014-06-02 15:25:12 +02:00
|
|
|
}
|
|
|
|
|
|
2018-06-19 15:41:31 +02:00
|
|
|
static void pc_memory_unplug_request(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2015-04-27 10:47:17 +02:00
|
|
|
{
|
2020-09-15 14:09:02 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
|
2015-04-27 10:47:17 +02:00
|
|
|
|
2017-12-22 02:51:20 +01:00
|
|
|
/*
|
|
|
|
|
* When -no-acpi is used with Q35 machine type, no ACPI is built,
|
|
|
|
|
* but pcms->acpi_dev is still created. Check !acpi_enabled in
|
|
|
|
|
* addition to cover this case.
|
|
|
|
|
*/
|
2020-09-15 14:09:02 +02:00
|
|
|
if (!x86ms->acpi_dev || !x86_machine_is_acpi_enabled(x86ms)) {
|
error: Avoid unnecessary error_propagate() after error_setg()
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
2020-07-07 18:06:01 +02:00
|
|
|
error_setg(errp,
|
2017-12-22 02:51:20 +01:00
|
|
|
"memory hotplug is not enabled: missing acpi device or acpi disabled");
|
error: Avoid unnecessary error_propagate() after error_setg()
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
2020-07-07 18:06:01 +02:00
|
|
|
return;
|
2015-04-27 10:47:17 +02:00
|
|
|
}
|
|
|
|
|
|
2016-10-28 18:35:40 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {
|
error: Avoid unnecessary error_propagate() after error_setg()
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
2020-07-07 18:06:01 +02:00
|
|
|
error_setg(errp, "nvdimm device hot unplug is not supported yet.");
|
|
|
|
|
return;
|
2016-10-28 18:35:40 +02:00
|
|
|
}
|
|
|
|
|
|
2020-09-15 14:09:02 +02:00
|
|
|
hotplug_handler_unplug_request(x86ms->acpi_dev, dev,
|
error: Avoid unnecessary error_propagate() after error_setg()
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
2020-07-07 18:06:01 +02:00
|
|
|
errp);
|
2015-04-27 10:47:17 +02:00
|
|
|
}
|
|
|
|
|
|
2018-06-19 15:41:31 +02:00
|
|
|
static void pc_memory_unplug(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2015-04-27 10:47:18 +02:00
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
2020-09-15 14:09:02 +02:00
|
|
|
X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
|
2015-04-27 10:47:18 +02:00
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
2020-09-15 14:09:02 +02:00
|
|
|
hotplug_handler_unplug(x86ms->acpi_dev, dev, &local_err);
|
2015-04-27 10:47:18 +02:00
|
|
|
if (local_err) {
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-05 11:20:12 +02:00
|
|
|
pc_dimm_unplug(PC_DIMM(dev), MACHINE(pcms));
|
2020-06-10 07:31:56 +02:00
|
|
|
qdev_unrealize(dev);
|
2015-04-27 10:47:18 +02:00
|
|
|
out:
|
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-26 09:22:42 +02:00
|
|
|
static void pc_virtio_md_pci_pre_plug(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2019-06-19 11:49:07 +02:00
|
|
|
{
|
|
|
|
|
HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev);
|
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
2020-06-26 09:22:28 +02:00
|
|
|
if (!hotplug_dev2 && dev->hotplugged) {
|
2019-06-19 11:49:07 +02:00
|
|
|
/*
|
|
|
|
|
* Without a bus hotplug handler, we cannot control the plug/unplug
|
2020-06-26 09:22:28 +02:00
|
|
|
* order. We should never reach this point when hotplugging on x86,
|
|
|
|
|
* however, better add a safety net.
|
2019-06-19 11:49:07 +02:00
|
|
|
*/
|
2020-06-26 09:22:42 +02:00
|
|
|
error_setg(errp, "hotplug of virtio based memory devices not supported"
|
|
|
|
|
" on this bus.");
|
2019-06-19 11:49:07 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* First, see if we can plug this memory device at all. If that
|
|
|
|
|
* succeeds, branch of to the actual hotplug handler.
|
|
|
|
|
*/
|
|
|
|
|
memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), NULL,
|
|
|
|
|
&local_err);
|
2020-06-26 09:22:28 +02:00
|
|
|
if (!local_err && hotplug_dev2) {
|
2019-06-19 11:49:07 +02:00
|
|
|
hotplug_handler_pre_plug(hotplug_dev2, dev, &local_err);
|
|
|
|
|
}
|
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-26 09:22:42 +02:00
|
|
|
static void pc_virtio_md_pci_plug(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2019-06-19 11:49:07 +02:00
|
|
|
{
|
|
|
|
|
HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev);
|
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Plug the memory device first and then branch off to the actual
|
|
|
|
|
* hotplug handler. If that one fails, we can easily undo the memory
|
|
|
|
|
* device bits.
|
|
|
|
|
*/
|
|
|
|
|
memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev));
|
2020-06-26 09:22:28 +02:00
|
|
|
if (hotplug_dev2) {
|
|
|
|
|
hotplug_handler_plug(hotplug_dev2, dev, &local_err);
|
|
|
|
|
if (local_err) {
|
|
|
|
|
memory_device_unplug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev));
|
|
|
|
|
}
|
2019-06-19 11:49:07 +02:00
|
|
|
}
|
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-26 09:22:42 +02:00
|
|
|
static void pc_virtio_md_pci_unplug_request(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2019-06-19 11:49:07 +02:00
|
|
|
{
|
2020-06-26 09:22:42 +02:00
|
|
|
/* We don't support hot unplug of virtio based memory devices */
|
|
|
|
|
error_setg(errp, "virtio based memory devices cannot be unplugged.");
|
2019-06-19 11:49:07 +02:00
|
|
|
}
|
|
|
|
|
|
2020-06-26 09:22:42 +02:00
|
|
|
static void pc_virtio_md_pci_unplug(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
2019-06-19 11:49:07 +02:00
|
|
|
{
|
2020-06-26 09:22:42 +02:00
|
|
|
/* We don't support hot unplug of virtio based memory devices */
|
2019-06-19 11:49:07 +02:00
|
|
|
}
|
|
|
|
|
|
2016-07-06 08:20:40 +02:00
|
|
|
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
|
{
|
2018-06-19 15:41:34 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
|
|
|
|
pc_memory_pre_plug(hotplug_dev, dev, errp);
|
|
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
2020-09-15 14:09:03 +02:00
|
|
|
x86_cpu_pre_plug(hotplug_dev, dev, errp);
|
2020-06-26 09:22:42 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
|
|
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
|
|
|
|
|
pc_virtio_md_pci_pre_plug(hotplug_dev, dev, errp);
|
2016-07-06 08:20:40 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-02 15:25:12 +02:00
|
|
|
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2018-06-19 15:41:31 +02:00
|
|
|
pc_memory_plug(hotplug_dev, dev, errp);
|
2014-10-22 05:24:28 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
2020-09-15 14:09:03 +02:00
|
|
|
x86_cpu_plug(hotplug_dev, dev, errp);
|
2020-06-26 09:22:42 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
|
|
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
|
|
|
|
|
pc_virtio_md_pci_plug(hotplug_dev, dev, errp);
|
2014-06-02 15:25:12 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-01-28 08:45:37 +01:00
|
|
|
static void pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
|
{
|
2015-04-27 10:47:17 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2018-06-19 15:41:31 +02:00
|
|
|
pc_memory_unplug_request(hotplug_dev, dev, errp);
|
2016-06-14 16:14:02 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
2020-09-15 14:09:03 +02:00
|
|
|
x86_cpu_unplug_request_cb(hotplug_dev, dev, errp);
|
2020-06-26 09:22:42 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
|
|
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
|
|
|
|
|
pc_virtio_md_pci_unplug_request(hotplug_dev, dev, errp);
|
2015-04-27 10:47:17 +02:00
|
|
|
} else {
|
|
|
|
|
error_setg(errp, "acpi: device unplug request for not supported device"
|
|
|
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
|
|
|
}
|
2015-01-28 08:45:37 +01:00
|
|
|
}
|
|
|
|
|
|
2015-01-28 08:45:39 +01:00
|
|
|
static void pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
|
|
|
|
|
DeviceState *dev, Error **errp)
|
|
|
|
|
{
|
2015-04-27 10:47:18 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
|
2018-06-19 15:41:31 +02:00
|
|
|
pc_memory_unplug(hotplug_dev, dev, errp);
|
2016-06-14 16:14:02 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
2020-09-15 14:09:03 +02:00
|
|
|
x86_cpu_unplug_cb(hotplug_dev, dev, errp);
|
2020-06-26 09:22:42 +02:00
|
|
|
} else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
|
|
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
|
|
|
|
|
pc_virtio_md_pci_unplug(hotplug_dev, dev, errp);
|
2015-04-27 10:47:18 +02:00
|
|
|
} else {
|
|
|
|
|
error_setg(errp, "acpi: device unplug for not supported device"
|
|
|
|
|
" type: %s", object_get_typename(OBJECT(dev)));
|
|
|
|
|
}
|
2015-01-28 08:45:39 +01:00
|
|
|
}
|
|
|
|
|
|
2019-01-24 08:36:26 +01:00
|
|
|
static HotplugHandler *pc_get_hotplug_handler(MachineState *machine,
|
2014-06-02 15:25:12 +02:00
|
|
|
DeviceState *dev)
|
|
|
|
|
{
|
2014-10-22 05:24:28 +02:00
|
|
|
if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) ||
|
2019-06-19 11:49:07 +02:00
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_CPU) ||
|
2020-06-26 09:22:42 +02:00
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
|
|
|
|
|
object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
|
2014-06-02 15:25:12 +02:00
|
|
|
return HOTPLUG_HANDLER(machine);
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-10 19:10:56 +02:00
|
|
|
return NULL;
|
2014-06-02 15:25:12 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-02 15:25:27 +02:00
|
|
|
static void
|
2018-04-23 18:51:24 +02:00
|
|
|
pc_machine_get_device_memory_region_size(Object *obj, Visitor *v,
|
|
|
|
|
const char *name, void *opaque,
|
|
|
|
|
Error **errp)
|
2014-06-02 15:25:27 +02:00
|
|
|
{
|
2018-04-23 18:51:17 +02:00
|
|
|
MachineState *ms = MACHINE(obj);
|
2019-06-24 11:02:00 +02:00
|
|
|
int64_t value = 0;
|
|
|
|
|
|
|
|
|
|
if (ms->device_memory) {
|
|
|
|
|
value = memory_region_size(&ms->device_memory->mr);
|
|
|
|
|
}
|
2014-06-02 15:25:27 +02:00
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_int(v, name, &value, errp);
|
2014-06-02 15:25:27 +02:00
|
|
|
}
|
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void pc_machine_get_vmport(Object *obj, Visitor *v, const char *name,
|
|
|
|
|
void *opaque, Error **errp)
|
2014-10-03 23:33:37 +02:00
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
2014-11-21 17:18:52 +01:00
|
|
|
OnOffAuto vmport = pcms->vmport;
|
2014-10-03 23:33:37 +02:00
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_OnOffAuto(v, name, &vmport, errp);
|
2014-10-03 23:33:37 +02:00
|
|
|
}
|
|
|
|
|
|
qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
@ rule1 @
identifier fn;
typedef Object, Visitor, Error;
identifier obj, v, opaque, name, errp;
@@
void fn
- (Object *obj, Visitor *v, void *opaque, const char *name,
+ (Object *obj, Visitor *v, const char *name, void *opaque,
Error **errp) { ... }
@@
identifier rule1.fn;
expression obj, v, opaque, name, errp;
@@
fn(obj, v,
- opaque, name,
+ name, opaque,
errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:55 +01:00
|
|
|
static void pc_machine_set_vmport(Object *obj, Visitor *v, const char *name,
|
|
|
|
|
void *opaque, Error **errp)
|
2014-10-03 23:33:37 +02:00
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp). This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order. It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
$ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings'). The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
// Part 1: Swap declaration order
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_start_struct
-(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type bool, TV, T1;
identifier ARG1;
@@
bool visit_optional
-(TV v, T1 ARG1, const char *name)
+(TV v, const char *name, T1 ARG1)
{ ... }
@@
type TV, TErr, TObj, T1;
identifier OBJ, ARG1;
@@
void visit_get_next_type
-(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
{ ... }
@@
type TV, TErr, TObj, T1, T2;
identifier OBJ, ARG1, ARG2;
@@
void visit_type_enum
-(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
{ ... }
@@
type TV, TErr, TObj;
identifier OBJ;
identifier VISIT_TYPE =~ "^visit_type_";
@@
void VISIT_TYPE
-(TV v, TObj OBJ, const char *name, TErr errp)
+(TV v, const char *name, TObj OBJ, TErr errp)
{ ... }
// Part 2: swap caller order
@@
expression V, NAME, OBJ, ARG1, ARG2, ERR;
identifier VISIT_TYPE =~ "^visit_type_";
@@
(
-visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
+visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-visit_optional(V, ARG1, NAME)
+visit_optional(V, NAME, ARG1)
|
-visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
+visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
|
-visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
+visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
|
-VISIT_TYPE(V, OBJ, NAME, ERR)
+VISIT_TYPE(V, NAME, OBJ, ERR)
)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-01-29 14:48:54 +01:00
|
|
|
visit_type_OnOffAuto(v, name, &pcms->vmport, errp);
|
2014-10-03 23:33:37 +02:00
|
|
|
}
|
|
|
|
|
|
2016-11-05 08:19:48 +01:00
|
|
|
static bool pc_machine_get_smbus(Object *obj, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
return pcms->smbus_enabled;
|
2016-11-05 08:19:48 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_smbus(Object *obj, bool value, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
pcms->smbus_enabled = value;
|
2016-11-05 08:19:48 +01:00
|
|
|
}
|
|
|
|
|
|
2016-11-05 08:19:49 +01:00
|
|
|
static bool pc_machine_get_sata(Object *obj, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
return pcms->sata_enabled;
|
2016-11-05 08:19:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_sata(Object *obj, bool value, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
pcms->sata_enabled = value;
|
2016-11-05 08:19:49 +01:00
|
|
|
}
|
|
|
|
|
|
2016-11-05 08:19:50 +01:00
|
|
|
static bool pc_machine_get_pit(Object *obj, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
return pcms->pit_enabled;
|
2016-11-05 08:19:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_pit(Object *obj, bool value, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2018-11-07 16:24:34 +01:00
|
|
|
pcms->pit_enabled = value;
|
2016-11-05 08:19:50 +01:00
|
|
|
}
|
|
|
|
|
|
2020-10-21 16:47:16 +02:00
|
|
|
static bool pc_machine_get_hpet(Object *obj, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
|
|
|
|
return pcms->hpet_enabled;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_hpet(Object *obj, bool value, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
|
|
|
|
pcms->hpet_enabled = value;
|
|
|
|
|
}
|
|
|
|
|
|
2021-07-08 14:55:14 +02:00
|
|
|
static bool pc_machine_get_default_bus_bypass_iommu(Object *obj, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
|
|
|
|
return pcms->default_bus_bypass_iommu;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_default_bus_bypass_iommu(Object *obj, bool value,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
|
|
|
|
pcms->default_bus_bypass_iommu = value;
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-29 09:39:56 +02:00
|
|
|
static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v,
|
|
|
|
|
const char *name, void *opaque,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
uint64_t value = pcms->max_ram_below_4g;
|
|
|
|
|
|
|
|
|
|
visit_type_size(v, name, &value, errp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v,
|
|
|
|
|
const char *name, void *opaque,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
uint64_t value;
|
|
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 18:06:02 +02:00
|
|
|
if (!visit_type_size(v, name, &value, errp)) {
|
2020-05-29 09:39:56 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (value > 4 * GiB) {
|
error: Avoid unnecessary error_propagate() after error_setg()
Replace
error_setg(&err, ...);
error_propagate(errp, err);
by
error_setg(errp, ...);
Related pattern:
if (...) {
error_setg(&err, ...);
goto out;
}
...
out:
error_propagate(errp, err);
return;
When all paths to label out are that way, replace by
if (...) {
error_setg(errp, ...);
return;
}
and delete the label along with the error_propagate().
When we have at most one other path that actually needs to propagate,
and maybe one at the end that where propagation is unnecessary, e.g.
foo(..., &err);
if (err) {
goto out;
}
...
bar(..., &err);
out:
error_propagate(errp, err);
return;
move the error_propagate() to where it's needed, like
if (...) {
foo(..., &err);
error_propagate(errp, err);
return;
}
...
bar(..., errp);
return;
and transform the error_setg() as above.
In some places, the transformation results in obviously unnecessary
error_propagate(). The next few commits will eliminate them.
Bonus: the elimination of gotos will make later patches in this series
easier to review.
Candidates for conversion tracked down with this Coccinelle script:
@@
identifier err, errp;
expression list args;
@@
- error_setg(&err, args);
+ error_setg(errp, args);
... when != err
error_propagate(errp, err);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-34-armbru@redhat.com>
2020-07-07 18:06:01 +02:00
|
|
|
error_setg(errp,
|
2020-05-29 09:39:56 +02:00
|
|
|
"Machine option 'max-ram-below-4g=%"PRIu64
|
|
|
|
|
"' expects size less than or equal to 4G", value);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (value < 1 * MiB) {
|
|
|
|
|
warn_report("Only %" PRIu64 " bytes of RAM below the 4GiB boundary,"
|
|
|
|
|
"BIOS may not work with less than 1MiB", value);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pcms->max_ram_below_4g = value;
|
|
|
|
|
}
|
|
|
|
|
|
2020-12-08 16:53:38 +01:00
|
|
|
static void pc_machine_get_max_fw_size(Object *obj, Visitor *v,
|
|
|
|
|
const char *name, void *opaque,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
uint64_t value = pcms->max_fw_size;
|
|
|
|
|
|
|
|
|
|
visit_type_size(v, name, &value, errp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void pc_machine_set_max_fw_size(Object *obj, Visitor *v,
|
|
|
|
|
const char *name, void *opaque,
|
|
|
|
|
Error **errp)
|
|
|
|
|
{
|
|
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
Error *error = NULL;
|
|
|
|
|
uint64_t value;
|
|
|
|
|
|
|
|
|
|
visit_type_size(v, name, &value, &error);
|
|
|
|
|
if (error) {
|
|
|
|
|
error_propagate(errp, error);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We don't have a theoretically justifiable exact lower bound on the base
|
|
|
|
|
* address of any flash mapping. In practice, the IO-APIC MMIO range is
|
|
|
|
|
* [0xFEE00000..0xFEE01000] -- see IO_APIC_DEFAULT_ADDRESS --, leaving free
|
|
|
|
|
* only 18MB-4KB below 4G. For now, restrict the cumulative mapping to 8MB in
|
|
|
|
|
* size.
|
|
|
|
|
*/
|
|
|
|
|
if (value > 16 * MiB) {
|
|
|
|
|
error_setg(errp,
|
|
|
|
|
"User specified max allowed firmware size %" PRIu64 " is "
|
|
|
|
|
"greater than 16MiB. If combined firwmare size exceeds "
|
|
|
|
|
"16MiB the system may not boot, or experience intermittent"
|
|
|
|
|
"stability issues.",
|
|
|
|
|
value);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pcms->max_fw_size = value;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-19 01:32:13 +01:00
|
|
|
|
2014-06-02 15:25:27 +02:00
|
|
|
static void pc_machine_initfn(Object *obj)
|
|
|
|
|
{
|
2014-06-20 03:40:25 +02:00
|
|
|
PCMachineState *pcms = PC_MACHINE(obj);
|
|
|
|
|
|
2019-07-12 18:02:57 +02:00
|
|
|
#ifdef CONFIG_VMPORT
|
2014-11-21 17:18:52 +01:00
|
|
|
pcms->vmport = ON_OFF_AUTO_AUTO;
|
2019-07-12 18:02:57 +02:00
|
|
|
#else
|
|
|
|
|
pcms->vmport = ON_OFF_AUTO_OFF;
|
|
|
|
|
#endif /* CONFIG_VMPORT */
|
2020-05-29 09:39:56 +02:00
|
|
|
pcms->max_ram_below_4g = 0; /* use default */
|
2016-11-01 18:44:16 +01:00
|
|
|
/* acpi build is enabled by default if machine supports it */
|
|
|
|
|
pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
|
2018-11-07 16:24:34 +01:00
|
|
|
pcms->smbus_enabled = true;
|
|
|
|
|
pcms->sata_enabled = true;
|
|
|
|
|
pcms->pit_enabled = true;
|
2020-12-08 16:53:38 +01:00
|
|
|
pcms->max_fw_size = 8 * MiB;
|
2020-10-21 16:47:16 +02:00
|
|
|
#ifdef CONFIG_HPET
|
|
|
|
|
pcms->hpet_enabled = true;
|
|
|
|
|
#endif
|
2021-07-08 14:55:14 +02:00
|
|
|
pcms->default_bus_bypass_iommu = false;
|
pc: Support firmware configuration with -blockdev
The PC machines put firmware in ROM by default. To get it put into
flash memory (required by OVMF), you have to use -drive
if=pflash,unit=0,... and optionally -drive if=pflash,unit=1,...
Why two -drive? This permits setting up one part of the flash memory
read-only, and the other part read/write. It also makes upgrading
firmware on the host easier. Below the hood, it creates two separate
flash devices, because we were too lazy to improve our flash device
models to support sector protection.
The problem at hand is to do the same with -blockdev somehow, as one
more step towards deprecating -drive.
Mapping -drive if=none,... to -blockdev is a solved problem. With
if=T other than if=none, -drive additionally configures a block device
frontend. For non-onboard devices, that part maps to -device. Also a
solved problem. For onboard devices such as PC flash memory, we have
an unsolved problem.
This is actually an instance of a wider problem: our general device
configuration interface doesn't cover onboard devices. Instead, we have
a zoo of ad hoc interfaces that are much more limited. One of them is
-drive, which we'd rather deprecate, but can't until we have suitable
replacements for all its uses.
Sadly, I can't attack the wider problem today. So back to the narrow
problem.
My first idea was to reduce it to its solved buddy by using pluggable
instead of onboard devices for the flash memory. Workable, but it
requires some extra smarts in firmware descriptors and libvirt. Paolo
had an idea that is simpler for libvirt: keep the devices onboard, and
add machine properties for their block backends.
The implementation is less than straightforward, I'm afraid.
First, block backend properties are *qdev* properties. Machines can't
have those, as they're not devices. I could duplicate these qdev
properties as QOM properties, but I hate that.
More seriously, the properties do not belong to the machine, they
belong to the onboard flash devices. Adding them to the machine would
then require bad magic to somehow transfer them to the flash devices.
Fortunately, QOM provides the means to handle exactly this case: add
alias properties to the machine that forward to the onboard devices'
properties.
Properties need to be created in .instance_init() methods. For PC
machines, that's pc_machine_initfn(). To make alias properties work,
we need to create the onboard flash devices there, too. Requires
several bug fixes, in the previous commits. We also have to realize
the devices. More on that below.
If the user sets pflash0, firmware resides in flash memory.
pc_system_firmware_init() maps and realizes the flash devices.
Else, firmware resides in ROM. The onboard flash devices aren't used
then. pc_system_firmware_init() destroys them unrealized, along with
the alias properties.
The existing code to pick up drives defined with -drive if=pflash is
replaced by code to desugar into the machine properties.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <87ftrtux81.fsf@dusky.pond.sub.org>
2019-03-11 18:39:26 +01:00
|
|
|
|
|
|
|
|
pc_system_flash_create(pcms);
|
2020-07-02 15:25:21 +02:00
|
|
|
pcms->pcspk = isa_new(TYPE_PC_SPEAKER);
|
2020-07-02 15:25:22 +02:00
|
|
|
object_property_add_alias(OBJECT(pcms), "pcspk-audiodev",
|
|
|
|
|
OBJECT(pcms->pcspk), "audiodev");
|
2014-06-02 15:25:27 +02:00
|
|
|
}
|
|
|
|
|
|
2019-05-18 22:54:20 +02:00
|
|
|
static void pc_machine_reset(MachineState *machine)
|
2015-09-16 11:19:13 +02:00
|
|
|
{
|
|
|
|
|
CPUState *cs;
|
|
|
|
|
X86CPU *cpu;
|
|
|
|
|
|
|
|
|
|
qemu_devices_reset();
|
|
|
|
|
|
|
|
|
|
/* Reset APIC after devices have been reset to cancel
|
|
|
|
|
* any changes that qemu_devices_reset() might have done.
|
|
|
|
|
*/
|
|
|
|
|
CPU_FOREACH(cs) {
|
|
|
|
|
cpu = X86_CPU(cs);
|
|
|
|
|
|
|
|
|
|
if (cpu->apic_state) {
|
2020-01-30 17:02:03 +01:00
|
|
|
device_legacy_reset(cpu->apic_state);
|
2015-09-16 11:19:13 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-07-22 08:17:51 +02:00
|
|
|
static void pc_machine_wakeup(MachineState *machine)
|
|
|
|
|
{
|
|
|
|
|
cpu_synchronize_all_states();
|
|
|
|
|
pc_machine_reset(machine);
|
|
|
|
|
cpu_synchronize_all_post_reset();
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-16 10:07:17 +02:00
|
|
|
static bool pc_hotplug_allowed(MachineState *ms, DeviceState *dev, Error **errp)
|
|
|
|
|
{
|
|
|
|
|
X86IOMMUState *iommu = x86_iommu_get_default();
|
|
|
|
|
IntelIOMMUState *intel_iommu;
|
|
|
|
|
|
|
|
|
|
if (iommu &&
|
|
|
|
|
object_dynamic_cast((Object *)iommu, TYPE_INTEL_IOMMU_DEVICE) &&
|
|
|
|
|
object_dynamic_cast((Object *)dev, "vfio-pci")) {
|
|
|
|
|
intel_iommu = INTEL_IOMMU_DEVICE(iommu);
|
|
|
|
|
if (!intel_iommu->caching_mode) {
|
|
|
|
|
error_setg(errp, "Device assignment is not allowed without "
|
|
|
|
|
"enabling caching-mode=on for Intel IOMMU.");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-02 15:25:12 +02:00
|
|
|
static void pc_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
|
{
|
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
|
|
|
|
|
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
|
|
|
|
|
2015-12-01 23:58:03 +01:00
|
|
|
pcmc->pci_enabled = true;
|
|
|
|
|
pcmc->has_acpi_build = true;
|
|
|
|
|
pcmc->rsdp_in_ram = true;
|
|
|
|
|
pcmc->smbios_defaults = true;
|
|
|
|
|
pcmc->smbios_uuid_encoded = true;
|
|
|
|
|
pcmc->gigabyte_align = true;
|
|
|
|
|
pcmc->has_reserved_memory = true;
|
|
|
|
|
pcmc->kvmclock_enabled = true;
|
2015-12-01 23:58:06 +01:00
|
|
|
pcmc->enforce_aligned_dimm = true;
|
2015-12-01 23:58:05 +01:00
|
|
|
/* BIOS ACPI tables: 128K. Other BIOS datastructures: less than 4K reported
|
|
|
|
|
* to be used at the moment, 32K should be enough for a while. */
|
|
|
|
|
pcmc->acpi_data_size = 0x20000 + 0x8000;
|
2017-04-25 17:37:50 +02:00
|
|
|
pcmc->linuxboot_dma_enabled = true;
|
2019-01-22 13:10:48 +01:00
|
|
|
pcmc->pvh_enabled = true;
|
2020-09-22 17:19:34 +02:00
|
|
|
pcmc->kvmclock_create_always = true;
|
2018-05-10 19:10:56 +02:00
|
|
|
assert(!mc->get_hotplug_handler);
|
2019-01-24 08:36:26 +01:00
|
|
|
mc->get_hotplug_handler = pc_get_hotplug_handler;
|
2019-09-16 10:07:17 +02:00
|
|
|
mc->hotplug_allowed = pc_hotplug_allowed;
|
2019-09-26 15:26:16 +02:00
|
|
|
mc->cpu_index_to_instance_props = x86_cpu_index_to_props;
|
|
|
|
|
mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;
|
|
|
|
|
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
|
2017-11-14 03:34:01 +01:00
|
|
|
mc->auto_enable_numa_with_memhp = true;
|
2020-06-26 09:22:48 +02:00
|
|
|
mc->auto_enable_numa_with_memdev = true;
|
2017-02-10 11:20:57 +01:00
|
|
|
mc->has_hotpluggable_cpus = true;
|
2015-08-07 21:55:47 +02:00
|
|
|
mc->default_boot_order = "cad";
|
2019-06-20 07:45:24 +02:00
|
|
|
mc->smp_parse = pc_smp_parse;
|
2017-02-15 11:05:40 +01:00
|
|
|
mc->block_default_type = IF_IDE;
|
2015-08-07 21:55:48 +02:00
|
|
|
mc->max_cpus = 255;
|
2015-09-16 11:19:13 +02:00
|
|
|
mc->reset = pc_machine_reset;
|
2019-07-22 08:17:51 +02:00
|
|
|
mc->wakeup = pc_machine_wakeup;
|
2016-07-06 08:20:40 +02:00
|
|
|
hc->pre_plug = pc_machine_device_pre_plug_cb;
|
2014-06-02 15:25:12 +02:00
|
|
|
hc->plug = pc_machine_device_plug_cb;
|
2015-01-28 08:45:37 +01:00
|
|
|
hc->unplug_request = pc_machine_device_unplug_request_cb;
|
2015-01-28 08:45:39 +01:00
|
|
|
hc->unplug = pc_machine_device_unplug_cb;
|
2017-09-13 18:04:56 +02:00
|
|
|
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
|
2019-03-08 19:20:53 +01:00
|
|
|
mc->nvdimm_supported = true;
|
2020-02-19 17:09:17 +01:00
|
|
|
mc->default_ram_id = "pc.ram";
|
2016-10-13 22:48:36 +02:00
|
|
|
|
2020-05-29 09:39:56 +02:00
|
|
|
object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
|
|
|
|
|
pc_machine_get_max_ram_below_4g, pc_machine_set_max_ram_below_4g,
|
|
|
|
|
NULL, NULL);
|
|
|
|
|
object_class_property_set_description(oc, PC_MACHINE_MAX_RAM_BELOW_4G,
|
|
|
|
|
"Maximum ram below the 4G boundary (32bit boundary)");
|
|
|
|
|
|
2018-04-23 18:51:24 +02:00
|
|
|
object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",
|
|
|
|
|
pc_machine_get_device_memory_region_size, NULL,
|
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 17:29:22 +02:00
|
|
|
NULL, NULL);
|
2016-10-13 22:48:36 +02:00
|
|
|
|
|
|
|
|
object_class_property_add(oc, PC_MACHINE_VMPORT, "OnOffAuto",
|
|
|
|
|
pc_machine_get_vmport, pc_machine_set_vmport,
|
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 17:29:22 +02:00
|
|
|
NULL, NULL);
|
2016-10-13 22:48:36 +02:00
|
|
|
object_class_property_set_description(oc, PC_MACHINE_VMPORT,
|
2020-05-05 17:29:15 +02:00
|
|
|
"Enable vmport (pc & q35)");
|
2016-10-13 22:48:36 +02:00
|
|
|
|
2016-11-05 08:19:48 +01:00
|
|
|
object_class_property_add_bool(oc, PC_MACHINE_SMBUS,
|
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 17:29:22 +02:00
|
|
|
pc_machine_get_smbus, pc_machine_set_smbus);
|
2016-11-05 08:19:49 +01:00
|
|
|
|
|
|
|
|
object_class_property_add_bool(oc, PC_MACHINE_SATA,
|
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 17:29:22 +02:00
|
|
|
pc_machine_get_sata, pc_machine_set_sata);
|
2016-11-05 08:19:50 +01:00
|
|
|
|
|
|
|
|
object_class_property_add_bool(oc, PC_MACHINE_PIT,
|
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 17:29:22 +02:00
|
|
|
pc_machine_get_pit, pc_machine_set_pit);
|
2020-10-21 16:47:16 +02:00
|
|
|
|
|
|
|
|
object_class_property_add_bool(oc, "hpet",
|
|
|
|
|
pc_machine_get_hpet, pc_machine_set_hpet);
|
2020-12-08 16:53:38 +01:00
|
|
|
|
2021-07-08 14:55:14 +02:00
|
|
|
object_class_property_add_bool(oc, "default_bus_bypass_iommu",
|
|
|
|
|
pc_machine_get_default_bus_bypass_iommu,
|
|
|
|
|
pc_machine_set_default_bus_bypass_iommu);
|
|
|
|
|
|
2020-12-08 16:53:38 +01:00
|
|
|
object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size",
|
|
|
|
|
pc_machine_get_max_fw_size, pc_machine_set_max_fw_size,
|
|
|
|
|
NULL, NULL);
|
|
|
|
|
object_class_property_set_description(oc, PC_MACHINE_MAX_FW_SIZE,
|
|
|
|
|
"Maximum combined firmware size");
|
2014-06-02 15:25:12 +02:00
|
|
|
}
|
|
|
|
|
|
2014-06-02 15:24:57 +02:00
|
|
|
static const TypeInfo pc_machine_info = {
|
|
|
|
|
.name = TYPE_PC_MACHINE,
|
2019-10-22 09:39:50 +02:00
|
|
|
.parent = TYPE_X86_MACHINE,
|
2014-06-02 15:24:57 +02:00
|
|
|
.abstract = true,
|
|
|
|
|
.instance_size = sizeof(PCMachineState),
|
2014-06-02 15:25:27 +02:00
|
|
|
.instance_init = pc_machine_initfn,
|
2014-06-02 15:24:57 +02:00
|
|
|
.class_size = sizeof(PCMachineClass),
|
2014-06-02 15:25:12 +02:00
|
|
|
.class_init = pc_machine_class_init,
|
|
|
|
|
.interfaces = (InterfaceInfo[]) {
|
|
|
|
|
{ TYPE_HOTPLUG_HANDLER },
|
|
|
|
|
{ }
|
|
|
|
|
},
|
2014-06-02 15:24:57 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void pc_machine_register_types(void)
|
|
|
|
|
{
|
|
|
|
|
type_register_static(&pc_machine_info);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type_init(pc_machine_register_types)
|
