mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'hw-misc-20251028' of https://github.com/philmd/qemu into staging
Misc HW patches Various fixes and cleanups: - Set FPCR exception flag bits for HPPA non-trapped exceptions - Convert VirtIONet::vlans from pointer to array and remove VMSTATE_BUFFER_POINTER_UNSAFE() - Remove redundant QOM typedef when OBJECT_DECLARE_SIMPLE_TYPE() is used - Have various QDev / SysBus helpers take a const device argument - Improve errors when loaders parse images - Remove IntelIOMMUState::dma_translation leftover - Remove most target_[u]long uses in hw/riscv/ - Fix DS1225Y MemoryRegion owner - Simplification refactors on Raven PCI Host Bridge # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmkAdQ8ACgkQ4+MsLN6t # wN5ochAAihqZQaRpLWeIt+EQMUAdkJwsg8ctLAz9vJE9leZZh10j1Uw2Y0b5EDKy # k3vwJUz0gDYnbbq33+FNBVv7Iq4bIvyundqX4odi4AOvRysJRBwkVQ+LeUo+Dyh3 # of1eKDX6psJTo4Jy1ooOkkUq0vWpJPrGZYyzR7bsPDgpuqNOfF6+mwMQkYDXa2uw # vCJIOnzl+IIHxpnT+XVVXJsO05LUzkAru38jkjQZ1BcWj07ggSs70U7jcOhtvkpC # x0hXcKNj+uHjoupoX8LMOb6M+D06oL6ZyW51++Cnqu/cAvQqP/VQtb7b4AAKj3G9 # yOMFZPyd4IObf7bxC4Zi/TYLYD43DrSppT4eU5zqYrzKSD6v0fdENkhqJuLTiLTa # cd4nhWJto+EdZBogp+jVW6ekLoC5CMqNT8HiqdGvDLMp45oSmlYPC030l4gBQdo8 # 4SUWLIRZULybObv+uF3heeaemahWIXOFpclCpITcLqa+VkXlboc0JH2PjbETvAQU # DBxSJ65izr4795rRhX5yoy2aBfiTFlYxIbpwztEzesdnAHw1N6gQ0J3WraxWSjAh # Y6IzXBAYLjZNTx5pongcuZT3cX7Cn+0zwaK/ajRcZhIvukDL/bT7GK25akcYIgBR # XS//Ccm79vs85o1zTBVLQzw343Bvtp4LfRLtrXjdLC+06pEixvo= # =5G1o # -----END PGP SIGNATURE----- # gpg: Signature made Tue 28 Oct 2025 08:47:27 AM CET # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [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: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'hw-misc-20251028' of https://github.com/philmd/qemu: (23 commits) hw/riscv: Widen OpenSBI dynamic info struct hw/riscv: Use generic hwaddr for firmware addresses hw/i386/intel_iommu: Remove an unused state field nw/nvram/ds1225y: Fix nvram MemoryRegion owner hw/ppc: Pass error_fatal to load_image_targphys() hw/core/loader: Pass errp to load_image_targphys_as() hw/core/loader: add check for zero size in load_image_targphys_as hw/core/loader: improve error handling in image loading functions hw/core/loader: capture Error from load_image_targphys hw/core/loader: Use qemu_open() instead of open() in get_image_size() hw/int/loongarch: Include missing 'system/memory.h' header hw/uefi: Include missing 'system/memory.h' header hw/sysbus: Have various helpers take a const SysBusDevice argument hw/qdev: Have qdev_get_gpio_out_connector() take const DeviceState arg hw/pci-host/raven: Simplify PCI bus creation hw/pci-host/raven: Use DEFINE_TYPES macro hw/pci-host/raven: Simplify host bridge type declaration hw/pci-host/raven: Simplify PCI facing part hw/pci-host/raven: Simplify creating PCI facing part migration/vmstate: remove VMSTATE_BUFFER_POINTER_UNSAFE macro ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
@@ -29,13 +29,15 @@
|
||||
#include "hw/qdev-core.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
typedef struct AUXSlave AUXSlave;
|
||||
typedef enum AUXCommand AUXCommand;
|
||||
typedef enum AUXReply AUXReply;
|
||||
|
||||
#define TYPE_AUXTOI2C "aux-to-i2c-bridge"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(AUXTOI2CState, AUXTOI2C)
|
||||
|
||||
#define TYPE_AUX_SLAVE "aux-slave"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(AUXSlave, AUX_SLAVE)
|
||||
|
||||
enum AUXCommand {
|
||||
WRITE_I2C = 0,
|
||||
READ_I2C = 1,
|
||||
@@ -73,9 +75,6 @@ struct AUXBus {
|
||||
AddressSpace aux_addr_space;
|
||||
};
|
||||
|
||||
#define TYPE_AUX_SLAVE "aux-slave"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(AUXSlave, AUX_SLAVE)
|
||||
|
||||
struct AUXSlave {
|
||||
/* < private > */
|
||||
DeviceState parent_obj;
|
||||
|
||||
@@ -23,7 +23,8 @@
|
||||
|
||||
#define MPHI_MMIO_SIZE 0x1000
|
||||
|
||||
typedef struct BCM2835MphiState BCM2835MphiState;
|
||||
#define TYPE_BCM2835_MPHI "bcm2835-mphi"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(BCM2835MphiState, BCM2835_MPHI)
|
||||
|
||||
struct BCM2835MphiState {
|
||||
SysBusDevice parent_obj;
|
||||
@@ -37,8 +38,4 @@ struct BCM2835MphiState {
|
||||
uint32_t swirq;
|
||||
};
|
||||
|
||||
#define TYPE_BCM2835_MPHI "bcm2835-mphi"
|
||||
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(BCM2835MphiState, BCM2835_MPHI)
|
||||
|
||||
#endif
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
* value of 100,000 the duty cycle for that PWM is 10%.
|
||||
*/
|
||||
#define NPCM7XX_PWM_MAX_DUTY 1000000
|
||||
|
||||
typedef struct NPCM7xxPWMState NPCM7xxPWMState;
|
||||
#define TYPE_NPCM7XX_PWM "npcm7xx-pwm"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxPWMState, NPCM7XX_PWM)
|
||||
|
||||
/**
|
||||
* struct NPCM7xxPWM - The state of a single PWM channel.
|
||||
@@ -100,7 +100,4 @@ struct NPCM7xxPWMState {
|
||||
uint32_t piir;
|
||||
};
|
||||
|
||||
#define TYPE_NPCM7XX_PWM "npcm7xx-pwm"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxPWMState, NPCM7XX_PWM)
|
||||
|
||||
#endif /* NPCM7XX_PWM_H */
|
||||
|
||||
Reference in New Issue
Block a user