Re: [Qemu-block] [Qemu-devel] [PATCH v3 09/15] monitor: Create monitor-internal.h with common definitions

[Markus Armbruster]

Kevin Wolf <address@hidden> writes:

> Before we can split monitor/misc.c, we need to create a header file that
> contains the common definitions that will be used by multiple source
> files.
>
> For a start, add the type definitions for Monitor, MonitorHMP and
> MonitorQMP and their dependencies. We'll add functions as needed when
> splitting monitor/misc.c.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> Reviewed-by: Dr. David Alan Gilbert <address@hidden>
> ---
>  monitor/monitor-internal.h | 148 +++++++++++++++++++++++++++++++++++++
>  monitor/misc.c             | 110 +--------------------------
>  MAINTAINERS                |   2 +
>  3 files changed, 151 insertions(+), 109 deletions(-)
>  create mode 100644 monitor/monitor-internal.h
>
> diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
> new file mode 100644
> index 0000000000..17a632b0ad
> --- /dev/null
> +++ b/monitor/monitor-internal.h
> @@ -0,0 +1,148 @@
> +/*
> + * QEMU monitor
> + *
> + * Copyright (c) 2003-2004 Fabrice Bellard
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a 
> copy
> + * of this software and associated documentation files (the "Software"), to 
> deal
> + * in the Software without restriction, including without limitation the 
> rights
> + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> + * copies of the Software, and to permit persons to whom the Software is
> + * furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
> FROM,
> + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> + * THE SOFTWARE.
> + */
> +
> +#ifndef MONITOR_INT_H
> +#define MONITOR_INT_H

Rename to MONITOR_INTERNAL_H, so it again matches the file name.  Can
touch up in my tree.

> +
> +#include "monitor/monitor.h"
> +#include "qapi/qmp/qdict.h"

These too are superfluous.  I'm willing to tolerate monitor.h anyway,
since anything including monitor-internal.h is almost certainly going to
need monitor.h, too.

> +#include "qapi/qmp/json-parser.h"
> +#include "qapi/qmp/dispatch.h"
> +#include "qapi/qapi-types-misc.h"
> +
> +#include "qemu/readline.h"
> +#include "chardev/char-fe.h"
> +#include "sysemu/iothread.h"

Another superfluous one.

Happy to drop these two #include in my tree.

[...]

With that:
Reviewed-by: Markus Armbruster <address@hidden>