mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
* Functional tests improvements
* Endianness improvements/clean-ups for the Microblaze machines * Remove obsolete -2.4 and -2.5 i440fx and q35 machine types and related code -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmg5mlARHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbX1eRAAjvTK4noIfzc9QQI7EyUafgdp65m44wwx vfjlLbhmEnWFF11Qhovc6o36N4zF4Pt30mbXZs0gQaDR5H9RT8wrg9kShirhZX3O 4raPHCJFBviUCktSg90eFtvuQnfVK9cBMB8PMRQix+V5wRXcCx+cc6ebnQZ+UHp4 L2d+qKRoHCPRO/dvQth4Be7a5pXqFQeu4gq7i/w9PCa7O+akSM3lc8dsJPuCiXgQ R7dkwsrRQzmiEC6aDmauNpsRRs0yptQs+9b83V4moLX07hk/R/I59EDFQqALLim7 jmSbLnulKSSCeatV54PE/K4QxT62iA2OuJ6wo/vzVBGpzLdKE4aq99OcNPDxwWi0 wc6xVDNtMyr81Ex4pZ0WgVKt57tDBIp9RijB5wTAhRPqKgnHtRGVNqX9TrsFls5L jIyKgfTxFKf9RA/a53p3uUXNmpLDVG63AhA9jWrAUtGOGJ0V+cDD2hTygXai8XTS 66aiEdMiuPFV2fApaEftcySFrMoT7RG1JHlcMjsTOpRdZF/x+rehFQKOHcdBeJ6r /zJ18MXbd5vEcglBz8joPwHu3mt2NLew+IvLPoAlwMfrniiNnUC+IY2Jzz3jYpBI WbbaesVG7J8SzJ6SwNOVuiCbiAImOkrxEz/8Jm783sZvWSzLYmwI9bBp9KXVxGty ed14fLi8g5U= =8SJJ -----END PGP SIGNATURE----- Merge tag 'pull-request-2025-05-30' of https://gitlab.com/thuth/qemu into staging * Functional tests improvements * Endianness improvements/clean-ups for the Microblaze machines * Remove obsolete -2.4 and -2.5 i440fx and q35 machine types and related code # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmg5mlARHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbX1eRAAjvTK4noIfzc9QQI7EyUafgdp65m44wwx # vfjlLbhmEnWFF11Qhovc6o36N4zF4Pt30mbXZs0gQaDR5H9RT8wrg9kShirhZX3O # 4raPHCJFBviUCktSg90eFtvuQnfVK9cBMB8PMRQix+V5wRXcCx+cc6ebnQZ+UHp4 # L2d+qKRoHCPRO/dvQth4Be7a5pXqFQeu4gq7i/w9PCa7O+akSM3lc8dsJPuCiXgQ # R7dkwsrRQzmiEC6aDmauNpsRRs0yptQs+9b83V4moLX07hk/R/I59EDFQqALLim7 # jmSbLnulKSSCeatV54PE/K4QxT62iA2OuJ6wo/vzVBGpzLdKE4aq99OcNPDxwWi0 # wc6xVDNtMyr81Ex4pZ0WgVKt57tDBIp9RijB5wTAhRPqKgnHtRGVNqX9TrsFls5L # jIyKgfTxFKf9RA/a53p3uUXNmpLDVG63AhA9jWrAUtGOGJ0V+cDD2hTygXai8XTS # 66aiEdMiuPFV2fApaEftcySFrMoT7RG1JHlcMjsTOpRdZF/x+rehFQKOHcdBeJ6r # /zJ18MXbd5vEcglBz8joPwHu3mt2NLew+IvLPoAlwMfrniiNnUC+IY2Jzz3jYpBI # WbbaesVG7J8SzJ6SwNOVuiCbiAImOkrxEz/8Jm783sZvWSzLYmwI9bBp9KXVxGty # ed14fLi8g5U= # =8SJJ # -----END PGP SIGNATURE----- # gpg: Signature made Fri 30 May 2025 07:45:20 EDT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2025-05-30' of https://gitlab.com/thuth/qemu: (25 commits) tests/unit/test-util-sockets: fix mem-leak on error object hw/net/vmxnet3: Merge DeviceRealize in InstanceInit hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition hw/core/machine: Remove hw_compat_2_5[] array hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE hw/i386/x86: Remove X86MachineClass::save_tsc_khz field hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition hw/net/e1000: Remove unused E1000_FLAG_MAC flag hw/core/machine: Remove hw_compat_2_4[] array hw/i386/pc: Remove pc_compat_2_4[] array hw/i386/pc: Remove PCMachineClass::broken_reserved_end field hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines docs: Deprecate the qemu-system-microblazeel binary hw/microblaze: Remove the big-endian variants of ml605 and xlnx-zynqmp-pmu ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
commit
107215089d
31 changed files with 197 additions and 510 deletions
42
hw/i386/pc.c
42
hw/i386/pc.c
|
@ -260,28 +260,6 @@ GlobalProperty pc_compat_2_6[] = {
|
|||
};
|
||||
const size_t pc_compat_2_6_len = G_N_ELEMENTS(pc_compat_2_6);
|
||||
|
||||
GlobalProperty pc_compat_2_5[] = {};
|
||||
const size_t pc_compat_2_5_len = G_N_ELEMENTS(pc_compat_2_5);
|
||||
|
||||
GlobalProperty pc_compat_2_4[] = {
|
||||
PC_CPU_MODEL_IDS("2.4.0")
|
||||
{ "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", }
|
||||
};
|
||||
const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4);
|
||||
|
||||
/*
|
||||
* @PC_FW_DATA:
|
||||
* Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
|
||||
|
@ -1002,14 +980,13 @@ void pc_memory_init(PCMachineState *pcms,
|
|||
|
||||
if (machine->device_memory) {
|
||||
uint64_t *val = g_malloc(sizeof(*val));
|
||||
uint64_t res_mem_end = machine->device_memory->base;
|
||||
|
||||
if (!pcmc->broken_reserved_end) {
|
||||
res_mem_end += memory_region_size(&machine->device_memory->mr);
|
||||
}
|
||||
uint64_t res_mem_end;
|
||||
|
||||
if (pcms->cxl_devices_state.is_enabled) {
|
||||
res_mem_end = cxl_resv_end;
|
||||
} else {
|
||||
res_mem_end = machine->device_memory->base
|
||||
+ memory_region_size(&machine->device_memory->mr);
|
||||
}
|
||||
*val = cpu_to_le64(ROUND_UP(res_mem_end, 1 * GiB));
|
||||
fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val));
|
||||
|
@ -1047,9 +1024,7 @@ uint64_t pc_pci_hole64_start(void)
|
|||
hole64_start = pc_get_cxl_range_end(pcms);
|
||||
} else if (pcmc->has_reserved_memory && (ms->ram_size < ms->maxram_size)) {
|
||||
pc_get_device_memory_range(pcms, &hole64_start, &size);
|
||||
if (!pcmc->broken_reserved_end) {
|
||||
hole64_start += size;
|
||||
}
|
||||
hole64_start += size;
|
||||
} else {
|
||||
hole64_start = pc_above_4g_end(pcms);
|
||||
}
|
||||
|
@ -1061,7 +1036,6 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
|
|||
{
|
||||
DeviceState *dev = NULL;
|
||||
|
||||
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_VGA);
|
||||
if (pci_bus) {
|
||||
PCIDevice *pcidev = pci_vga_init(pci_bus);
|
||||
dev = pcidev ? &pcidev->qdev : NULL;
|
||||
|
@ -1069,7 +1043,7 @@ DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus)
|
|||
ISADevice *isadev = isa_vga_init(isa_bus);
|
||||
dev = isadev ? DEVICE(isadev) : NULL;
|
||||
}
|
||||
rom_reset_order_override();
|
||||
|
||||
return dev;
|
||||
}
|
||||
|
||||
|
@ -1259,8 +1233,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
|
|||
bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000);
|
||||
NICInfo *nd;
|
||||
|
||||
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
|
||||
|
||||
while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) {
|
||||
pc_init_ne2k_isa(isa_bus, nd, &error_fatal);
|
||||
}
|
||||
|
@ -1269,8 +1241,6 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
|
|||
if (pci_bus) {
|
||||
pci_init_nic_devices(pci_bus, mc->default_nic);
|
||||
}
|
||||
|
||||
rom_reset_order_override();
|
||||
}
|
||||
|
||||
void pc_i8259_create(ISABus *isa_bus, qemu_irq *i8259_irqs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue