decodetree: Introduce whex and whexC helpers

[qemu.git] / chardev / char-ringbuf.c

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index d130069e8886f79fce593246d21dd7462da2b0ee..d40d21d3cf78cb0ab5ac997909c6009b313ca41b 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -21,23 +21,29 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
-#include "sysemu/char.h"
-#include "qmp-commands.h"
+#include "chardev/char.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-char.h"
 #include "qemu/base64.h"
+#include "qemu/module.h"
+#include "qemu/option.h"
+#include "qom/object.h"
 
 /* Ring buffer chardev */
 
-typedef struct {
+struct RingBufChardev {
     Chardev parent;
     size_t size;
     size_t prod;
     size_t cons;
     uint8_t *cbuf;
-} RingBufChardev;
+};
+typedef struct RingBufChardev RingBufChardev;
 
-#define RINGBUF_CHARDEV(obj)                                    \
-    OBJECT_CHECK(RingBufChardev, (obj), TYPE_CHARDEV_RINGBUF)
+DECLARE_INSTANCE_CHECKER(RingBufChardev, RINGBUF_CHARDEV,
+                         TYPE_CHARDEV_RINGBUF)
 
 static size_t ringbuf_count(const Chardev *chr)
 {