@@ -59,9 +59,9 @@ struct pci_status {
uint32_t down;
};
-struct CPUStatus {
+typedef struct CPUStatus {
uint8_t sts[PIIX4_PROC_LEN];
-};
+} CPUStatus;
typedef struct PIIX4PMState {
PCIDevice dev;
@@ -92,7 +92,7 @@ typedef struct PIIX4PMState {
uint8_t disable_s4;
uint8_t s4_val;
- struct CPUStatus gpe_cpu;
+ CPUStatus gpe_cpu;
Notifier cpu_added_notifier;
} PIIX4PMState;
@@ -597,10 +597,10 @@ static const MemoryRegionOps piix4_pci_ops = {
},
};
-static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned width)
+static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int
size)
{
PIIX4PMState *s = opaque;
- struct CPUStatus *cpus = &s->gpe_cpu;
+ CPUStatus *cpus = &s->gpe_cpu;
uint64_t val = cpus->sts[addr];