Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: 465cedf1a7fb49e28ab0a39d1e0e5b766f09a06e
https://github.com/qemu/qemu/commit/465cedf1a7fb49e28ab0a39d1e0e5b766f09a06e
Author: Stefan Hajnoczi <[email protected]>
Date: 2024-12-16 (Mon, 16 Dec 2024)
Changed paths:
M hw/intc/loongarch_extioi.c
A hw/intc/loongarch_extioi_common.c
M hw/intc/loongarch_pch_pic.c
A hw/intc/loongarch_pic_common.c
M hw/intc/meson.build
M hw/loongarch/virt.c
M include/hw/intc/loongarch_extioi.h
A include/hw/intc/loongarch_extioi_common.h
M include/hw/intc/loongarch_pch_pic.h
A include/hw/intc/loongarch_pic_common.h
Log Message:
-----------
Merge tag 'pull-loongarch-20241216' of https://gitlab.com/bibo-mao/qemu into
staging
loongarch queue
# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQQNhkKjomWfgLCz0aQfewwSUazn0QUCZ1+CXAAKCRAfewwSUazn
# 0RlpAP9kYLfUiLWtS7NNhHpKe0lCY8lkpQefJuqx7yLe7FpexwD9G00PV+Hp9Z8V
# S+PTDrFQJVA1CLuEzitiG9NJzO75WAM=
# =3apt
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 15 Dec 2024 20:29:00 EST
# gpg: using EDDSA key 0D8642A3A2659F80B0B3D1A41F7B0C1251ACE7D1
# gpg: Good signature from "bibo mao <[email protected]>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7044 3A00 19C0 E97A 31C7 13C4 8E86 8FB7 A176 9D4C
# Subkey fingerprint: 0D86 42A3 A265 9F80 B0B3 D1A4 1F7B 0C12 51AC E7D1
* tag 'pull-loongarch-20241216' of https://gitlab.com/bibo-mao/qemu:
hw/intc/loongarch_extioi: Code cleanup about loongarch_extioi
hw/intc/loongarch_extioi: Add pre_save interface
hw/intc/loongarch_extioi: Inherit from loongarch_extioi_common
hw/intc/loongarch_extioi: Add common file loongarch_extioi_common
hw/intc/loongarch_extioi: Add unrealize interface
hw/intc/loongarch_extioi: Add common realize interface
hw/intc/loongarch_extioi: Rename LoongArchExtIOI with
LoongArchExtIOICommonState
include: Rename LoongArchExtIOI with LoongArchExtIOICommonState
include: Move struct LoongArchExtIOI to header file loongarch_extioi_common
include: Add loongarch_extioi_common header file
hw/intc/loongarch_pch: Code cleanup about loongarch_pch_pic
hw/intc/loongarch_pch: Add pre_save and post_load interfaces
hw/intc/loongarch_pch: Inherit from loongarch_pic_common
hw/intc/loongarch_pch: Move some functions to file loongarch_pic_common
hw/intc/loongarch_pch: Rename LoongArchPCHPIC with LoongArchPICCommonState
hw/intc/loongarch_pch: Merge instance_init() into realize()
include: Move struct LoongArchPCHPIC to loongarch_pic_common header file
include: Add loongarch_pic_common header file
Conflicts:
- hw/intc/loongarch_extioi.c
- hw/intc/loongarch_pch_pic.c
These conflict with the previous pull request that constified
Property. Constify the loonarch Properties to resolve the conflict.
Signed-off-by: Stefan Hajnoczi <[email protected]>
Commit: 466535ecb37d28ef79aecc4550b7cd1160c6beac
https://github.com/qemu/qemu/commit/466535ecb37d28ef79aecc4550b7cd1160c6beac
Author: Stefan Hajnoczi <[email protected]>
Date: 2024-12-16 (Mon, 16 Dec 2024)
Changed paths:
M hw/core/machine.c
M hw/i386/x86-common.c
M include/hw/boards.h
A pc-bios/descriptors/60-edk2-riscv64.json
M pc-bios/descriptors/60-edk2-x86_64.json
M pc-bios/descriptors/meson.build
M qemu-options.hx
M roms/Makefile
M system/vl.c
Log Message:
-----------
Merge tag 'firmware-20241216-pull-request' of https://gitlab.com/kraxel/qemu
into staging
x86/loader: fix efi binary loading
x86/loader: support secure boot with direct kernel load
firmware: json descriptor updates
roms: re-add edk2-basetools target
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEoDKM/7k6F6eZAf59TLbY7tPocTgFAmdgBfwACgkQTLbY7tPo
# cTj7MQ/+MJkVWTYN59Yy1o+XgfIBMoPKuF8Rm9jyosR751Nb5slw7ivd/nr9vKOd
# QNmCUNSHqNhkt10fGZmiL/OBNPH2I226iJ/QPB6CPgn+klWu9/n/qCYHKqkUl+4V
# uAe2CtsljiMmBouJUshmUvtUeB62aykwYYUBb2WfpElBaAvDqs8O+WBCp/83ugfP
# pd0G/bG+7lI6co9KLa3u7hMgcmxu2t/uKd55BaD/H2+Py353geQtnwXThom33jhy
# RMDzSZKWXxcXpwYtGJmUgy2XQqRwCe2uCqCldJ+Yn+VqWIJhszGrfxa1W3AQWoT0
# BHcnH9uriEwMEL5gO6i83m1No9tPJQaw9qhOa/zKtAxoVjdB9FBab1+MYCyYiS4N
# BBz6pIwR+74iDjn1SCOn4vJPmblEL6qtV+IB7MauG1o9GN6IluWDDHotpcmI5B6k
# oXh7mld70cqUFWjFZvoPYEp6HBAvhXLyUf3A4fQoemEX6mSVM9eYol4GM4gTj0gs
# IsBfd9wvHmaurpXMgB0cJOpr7UbbijtssseB/WzkMWlKskuMlJxsif/IEJO+GrbZ
# RdEcdVOr45Ty1Hmqv6b9M9kUojphUchLe6nl+CQihm3K7dF27yqhcJYqNTe7mKpt
# 4+i6RZaTKKtbY8FL80ycDRZIkDZg9cwMQHMxrDABQVN5WpVfRgU=
# =4fZc
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 16 Dec 2024 05:50:36 EST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>" [full]
# gpg: aka "Gerd Hoffmann <[email protected]>" [full]
# gpg: aka "Gerd Hoffmann (private) <[email protected]>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* tag 'firmware-20241216-pull-request' of https://gitlab.com/kraxel/qemu:
roms: re-add edk2-basetools target
pc-bios: add missing riscv64 descriptor
pc-bios: Add amd-sev-es to edk2 json
x86/loader: add -shim option
x86/loader: expose unpatched kernel
x86/loader: read complete kernel
x86/loader: only patch linux kernels
Signed-off-by: Stefan Hajnoczi <[email protected]>
Compare: https://github.com/qemu/qemu/compare/357e735eabea...466535ecb37d
To unsubscribe from these emails, change your notification settings at
https://github.com/qemu/qemu/settings/notifications
