diff options
| -rw-r--r-- | arch_init.c | 5 | ||||
| -rw-r--r-- | hw/vfio_pci.c | 5 | ||||
| -rw-r--r-- | pc-bios/acpi-dsdt.aml | bin | 4540 -> 4438 bytes | |||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 262144 bytes | |||
| -rw-r--r-- | pc-bios/q35-acpi-dsdt.aml | bin | 0 -> 7458 bytes | |||
| m--------- | roms/seabios | 0 |
6 files changed, 6 insertions, 4 deletions
diff --git a/arch_init.c b/arch_init.c index e6effe809a..83dcc53ff5 100644 --- a/arch_init.c +++ b/arch_init.c @@ -568,7 +568,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) int64_t ram_pages = last_ram_offset() >> TARGET_PAGE_BITS; migration_bitmap = bitmap_new(ram_pages); - bitmap_set(migration_bitmap, 1, ram_pages); + bitmap_set(migration_bitmap, 0, ram_pages); migration_dirty_pages = ram_pages; bytes_transferred = 0; @@ -840,7 +840,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) memset(host, ch, TARGET_PAGE_SIZE); #ifndef _WIN32 if (ch == 0 && - (!kvm_enabled() || kvm_has_sync_mmu())) { + (!kvm_enabled() || kvm_has_sync_mmu()) && + getpagesize() <= TARGET_PAGE_SIZE) { qemu_madvise(host, TARGET_PAGE_SIZE, QEMU_MADV_DONTNEED); } #endif diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 7c27834e06..fbfe670078 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -275,7 +275,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev) int ret, argsz; int32_t *pfd; - if (!kvm_irqchip_in_kernel() || + if (!kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED || !kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { return; @@ -438,7 +438,8 @@ static int vfio_enable_intx(VFIODevice *vdev) * Only conditional to avoid generating error messages on platforms * where we won't actually use the result anyway. */ - if (kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { + if (kvm_irqfds_enabled() && + kvm_check_extension(kvm_state, KVM_CAP_IRQFD_RESAMPLE)) { vdev->intx.route = pci_device_route_intx_to_irq(&vdev->pdev, vdev->intx.pin); } diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml Binary files differindex bb3dd83a56..18b4dc1aa5 100644 --- a/pc-bios/acpi-dsdt.aml +++ b/pc-bios/acpi-dsdt.aml diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex dc9b57ddc9..3eefff4cf8 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/pc-bios/q35-acpi-dsdt.aml b/pc-bios/q35-acpi-dsdt.aml Binary files differnew file mode 100644 index 0000000000..8a50559514 --- /dev/null +++ b/pc-bios/q35-acpi-dsdt.aml diff --git a/roms/seabios b/roms/seabios -Subproject b1c35f2b28cc0c94ebed8176ff61ac0e0b37779 +Subproject e8a76b0f225bba5ba9d63ab227e0a37b3beb105 |