From: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: Fri, 11 Jan 2019 14:08:50 +0000 (+0100)
Subject: hw/char/serial: Remove SerialState from "qemu/typedefs.h"
X-Git-Tag: v4.0.0-rc0~152^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1451b4044328230d3a10fb05907624b10ad6679e;p=thirdparty%2Fqemu.git

hw/char/serial: Remove SerialState from "qemu/typedefs.h"

Files requiring SerialState already include "hw/char/serial.h".

To clean "qemu/typedefs.h", move the declaration to "hw/char/serial.h"
(removing the forward declaration).

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 0acfbbc3826..abd5cf71a91 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -35,7 +35,7 @@
 
 #define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */
 
-struct SerialState {
+typedef struct SerialState {
     uint16_t divider;
     uint8_t rbr; /* receive register */
     uint8_t thr; /* transmit holding register */
@@ -77,7 +77,7 @@ struct SerialState {
 
     QEMUTimer *modem_status_poll;
     MemoryRegion io;
-};
+} SerialState;
 
 extern const VMStateDescription vmstate_serial;
 extern const MemoryRegionOps serial_io_ops;
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index d17f289650a..5d8b153344a 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -103,7 +103,6 @@ typedef struct QObject QObject;
 typedef struct QString QString;
 typedef struct RAMBlock RAMBlock;
 typedef struct Range Range;
-typedef struct SerialState SerialState;
 typedef struct SHPCDevice SHPCDevice;
 typedef struct SSIBus SSIBus;
 typedef struct uWireSlave uWireSlave;