diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/sm4.h | 6 | ||||
| -rw-r--r-- | include/hw/core/sysbus-fdt.h (renamed from include/hw/arm/sysbus-fdt.h) | 0 | ||||
| -rw-r--r-- | include/hw/riscv/virt.h | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h new file mode 100644 index 0000000000..9bd3ebc62e --- /dev/null +++ b/include/crypto/sm4.h @@ -0,0 +1,6 @@ +#ifndef QEMU_SM4_H +#define QEMU_SM4_H + +extern const uint8_t sm4_sbox[256]; + +#endif diff --git a/include/hw/arm/sysbus-fdt.h b/include/hw/core/sysbus-fdt.h index 340c382cdd..340c382cdd 100644 --- a/include/hw/arm/sysbus-fdt.h +++ b/include/hw/core/sysbus-fdt.h diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 78b058ec86..984e55c77f 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -45,6 +45,8 @@ struct RISCVVirtState { MachineState parent; /*< public >*/ + Notifier machine_done; + DeviceState *platform_bus_dev; RISCVHartArrayState soc[VIRT_SOCKETS_MAX]; DeviceState *irqchip[VIRT_SOCKETS_MAX]; PFlashCFI01 *flash[2]; @@ -75,6 +77,7 @@ enum { VIRT_DRAM, VIRT_PCIE_MMIO, VIRT_PCIE_PIO, + VIRT_PLATFORM_BUS, VIRT_PCIE_ECAM }; @@ -84,9 +87,12 @@ enum { VIRTIO_IRQ = 1, /* 1 to 8 */ VIRTIO_COUNT = 8, PCIE_IRQ = 0x20, /* 32 to 35 */ - VIRTIO_NDEV = 0x35 /* Arbitrary maximum number of interrupts */ + VIRT_PLATFORM_BUS_IRQ = 64, /* 64 to 96 */ + VIRTIO_NDEV = 96 /* Arbitrary maximum number of interrupts */ }; +#define VIRT_PLATFORM_BUS_NUM_IRQS 32 + #define VIRT_IRQCHIP_IPI_MSI 1 #define VIRT_IRQCHIP_NUM_MSIS 255 #define VIRT_IRQCHIP_NUM_SOURCES VIRTIO_NDEV |