Fat-fingered the cc. Markus Armbruster <arm...@redhat.com> writes:
> "Please keep this list in alphabetical order" has been more honoured > in the breach than in the observance. Clean up. > > While there, drop a redundant struct declaration. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > include/qemu/typedefs.h | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h > index 6b1093d..3eedcf4 100644 > --- a/include/qemu/typedefs.h > +++ b/include/qemu/typedefs.h > @@ -3,7 +3,6 @@ > > /* A load of opaque types so that device init declarations don't have to > pull in all the real definitions. */ > -struct Monitor; > > /* Please keep this list in alphabetical order */ > typedef struct AdapterInfo AdapterInfo; > @@ -19,8 +18,8 @@ typedef struct BusState BusState; > typedef struct CharDriverState CharDriverState; > typedef struct CompatProperty CompatProperty; > typedef struct CPUAddressSpace CPUAddressSpace; > -typedef struct DeviceState DeviceState; > typedef struct DeviceListener DeviceListener; > +typedef struct DeviceState DeviceState; > typedef struct DisplayChangeListener DisplayChangeListener; > typedef struct DisplayState DisplayState; > typedef struct DisplaySurface DisplaySurface; > @@ -46,6 +45,7 @@ typedef struct MigrationIncomingState > MigrationIncomingState; > typedef struct MigrationParams MigrationParams; > typedef struct MigrationState MigrationState; > typedef struct Monitor Monitor; > +typedef struct MonitorDef MonitorDef; > typedef struct MouseTransformInfo MouseTransformInfo; > typedef struct MSIMessage MSIMessage; > typedef struct NetClientState NetClientState; > @@ -63,13 +63,13 @@ typedef struct PCIESlot PCIESlot; > typedef struct PCIExpressDevice PCIExpressDevice; > typedef struct PCIExpressHost PCIExpressHost; > typedef struct PCIHostState PCIHostState; > -typedef struct PCMachineState PCMachineState; > typedef struct PCMachineClass PCMachineClass; > +typedef struct PCMachineState PCMachineState; > typedef struct PCMCIACardState PCMCIACardState; > typedef struct PixelFormat PixelFormat; > typedef struct PostcopyDiscardState PostcopyDiscardState; > -typedef struct PropertyInfo PropertyInfo; > typedef struct Property Property; > +typedef struct PropertyInfo PropertyInfo; > typedef struct QEMUBH QEMUBH; > typedef struct QemuConsole QemuConsole; > typedef struct QEMUFile QEMUFile; > @@ -78,10 +78,10 @@ typedef struct QemuOpts QemuOpts; > typedef struct QemuOptsList QemuOptsList; > typedef struct QEMUSGList QEMUSGList; > typedef struct QEMUSizedBuffer QEMUSizedBuffer; > -typedef struct QEMUTimerListGroup QEMUTimerListGroup; > typedef struct QEMUTimer QEMUTimer; > -typedef struct Range Range; > +typedef struct QEMUTimerListGroup QEMUTimerListGroup; > typedef struct RAMBlock RAMBlock; > +typedef struct Range Range; > typedef struct SerialState SerialState; > typedef struct SHPCDevice SHPCDevice; > typedef struct SMBusDevice SMBusDevice; > @@ -89,6 +89,5 @@ typedef struct SSIBus SSIBus; > typedef struct uWireSlave uWireSlave; > typedef struct VirtIODevice VirtIODevice; > typedef struct Visitor Visitor; > -typedef struct MonitorDef MonitorDef; > > #endif /* QEMU_TYPEDEFS_H */