diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-06-23 09:21:32 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-06-26 14:30:28 +0100 |
| commit | 888b2b034a29fa8fe99417c9665e0d671a9f33fb (patch) | |
| tree | fb773bd04edc63d03d1b6eaa8c783e64eedde272 /include/hw | |
| parent | 612b219a2a6e3d8192ce1d2408780be655f60359 (diff) | |
| download | qemu-888b2b034a29fa8fe99417c9665e0d671a9f33fb.zip qemu-888b2b034a29fa8fe99417c9665e0d671a9f33fb.tar.gz qemu-888b2b034a29fa8fe99417c9665e0d671a9f33fb.tar.bz2 | |
hw/arm/aspeed: QOM'ify AspeedMachineState
AspeedMachineState seems crippled. We use incorrectly 2
different structures to do the same thing. Merge them
altogether:
- Move AspeedMachine fields to AspeedMachineState
- AspeedMachineState is now QOM
- Remove unused AspeedMachine structure
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-id: 20200623072132.2868-4-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/arm/aspeed.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 5114ba0..09da9d9 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -15,13 +15,7 @@ typedef struct AspeedMachineState AspeedMachineState; #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") #define ASPEED_MACHINE(obj) \ - OBJECT_CHECK(AspeedMachine, (obj), TYPE_ASPEED_MACHINE) - -typedef struct AspeedMachine { - MachineState parent_obj; - - bool mmio_exec; -} AspeedMachine; + OBJECT_CHECK(AspeedMachineState, (obj), TYPE_ASPEED_MACHINE) #define ASPEED_MAC0_ON (1 << 0) #define ASPEED_MAC1_ON (1 << 1) |