The following changes since commit 076243ffe6c1b687e9e6d98348c3bf3398df78f3:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20190617' into staging (2019-06-17 16:41:25 +0100)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2019-06-17

for you to fetch changes up to 092b8737c5e7695c4b9caa3b4eedc66763632755:

  vl: Deprecate -mon pretty=... for HMP monitors (2019-06-17 20:36:56 +0200)

----------------------------------------------------------------
Monitor patches for 2019-06-17

----------------------------------------------------------------
Kevin Wolf (15):
      monitor: Remove unused password prompting fields
      monitor: Split monitor_init in HMP and QMP function
      monitor: Make MonitorQMP a child class of Monitor
      monitor: Create MonitorHMP with readline state
      monitor: Remove Monitor.cmd_table indirection
      monitor: Rename HMP command type and tables
      Move monitor.c to monitor/misc.c
      monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c
      monitor: Create monitor-internal.h with common definitions
      monitor: Split out monitor/qmp.c
      monitor: Split out monitor/hmp.c
      monitor: Split out monitor/monitor.c
      monitor: Split Monitor.flags into separate bools
      monitor: Replace monitor_init() with monitor_init_{hmp, qmp}()
      vl: Deprecate -mon pretty=... for HMP monitors

Yury Kotov (1):
      monitor: Fix return type of monitor_fdset_dup_fd_find

 MAINTAINERS                         |   13 +-
 Makefile.objs                       |    4 +-
 Makefile.target                     |    3 +-
 chardev/char.c                      |    2 +-
 docs/devel/writing-qmp-commands.txt |   11 +-
 gdbstub.c                           |    2 +-
 hmp-commands.hx                     |    2 +-
 include/monitor/monitor.h           |   17 +-
 monitor.c                           | 4729 -----------------------------------
 monitor/Makefile.objs               |    3 +
 hmp.c => monitor/hmp-cmds.c         |    7 +-
 monitor/hmp.c                       | 1416 +++++++++++
 monitor/misc.c                      | 2353 +++++++++++++++++
 monitor/monitor-internal.h          |  183 ++
 monitor/monitor.c                   |  628 +++++
 qmp.c => monitor/qmp-cmds.c         |    2 +-
 monitor/qmp.c                       |  404 +++
 monitor/trace-events                |   15 +
 qemu-deprecated.texi                |    6 +
 stubs/fdset.c                       |    2 +-
 stubs/monitor.c                     |    6 +-
 tests/test-util-sockets.c           |    3 +-
 trace-events                        |   10 -
 vl.c                                |   28 +-
 24 files changed, 5072 insertions(+), 4777 deletions(-)
 delete mode 100644 monitor.c
 create mode 100644 monitor/Makefile.objs
 rename hmp.c => monitor/hmp-cmds.c (99%)
 create mode 100644 monitor/hmp.c
 create mode 100644 monitor/misc.c
 create mode 100644 monitor/monitor-internal.h
 create mode 100644 monitor/monitor.c
 rename qmp.c => monitor/qmp-cmds.c (99%)
 create mode 100644 monitor/qmp.c
 create mode 100644 monitor/trace-events

-- 
2.21.0

Patchew URL: https://patchew.org/QEMU/20190617184903.19436-1-armbru@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [Qemu-devel] [PULL 00/16] Monitor patches for 2019-06-17
Type: series
Message-id: 20190617184903.19436-1-armbru@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20190617175317.27557-1-peter.maydell@linaro.org -> patchew/20190617175317.27557-1-peter.maydell@linaro.org
Switched to a new branch 'test'
10cbb82 vl: Deprecate -mon pretty=... for HMP monitors
c8d6357 monitor: Replace monitor_init() with monitor_init_{hmp, qmp}()
add28d5 monitor: Split Monitor.flags into separate bools
61f535a monitor: Split out monitor/monitor.c
1f84df4 monitor: Split out monitor/hmp.c
7b0f436 monitor: Split out monitor/qmp.c
62fff9a monitor: Create monitor-internal.h with common definitions
0be87c8 monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c
9dc5b85 Move monitor.c to monitor/misc.c
32b2352 monitor: Rename HMP command type and tables
6259cf7 monitor: Remove Monitor.cmd_table indirection
4cc8716 monitor: Create MonitorHMP with readline state
e28b9ba monitor: Make MonitorQMP a child class of Monitor
0032c2c monitor: Split monitor_init in HMP and QMP function
8ef4253 monitor: Remove unused password prompting fields
f21701f monitor: Fix return type of monitor_fdset_dup_fd_find

=== OUTPUT BEGIN ===
1/16 Checking commit f21701f2afc2 (monitor: Fix return type of monitor_fdset_dup_fd_find)
2/16 Checking commit 8ef4253a4478 (monitor: Remove unused password prompting fields)
3/16 Checking commit 0032c2cf455d (monitor: Split monitor_init in HMP and QMP function)
4/16 Checking commit e28b9ba8e716 (monitor: Make MonitorQMP a child class of Monitor)
5/16 Checking commit 4cc8716de54a (monitor: Create MonitorHMP with readline state)
6/16 Checking commit 6259cf7f6c52 (monitor: Remove Monitor.cmd_table indirection)
7/16 Checking commit 32b235292bf6 (monitor: Rename HMP command type and tables)
8/16 Checking commit 9dc5b85526e4 (Move monitor.c to monitor/misc.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#82: 
new file mode 100644

total: 0 errors, 1 warnings, 78 lines checked

Patch 8/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/16 Checking commit 0be87c866744 (monitor: Move {hmp, qmp}.c to monitor/{hmp, qmp}-cmds.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#106: 
rename from hmp.c

total: 0 errors, 1 warnings, 73 lines checked

Patch 9/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
10/16 Checking commit 62fff9aeab3c (monitor: Create monitor-internal.h with common definitions)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#227: 
new file mode 100644

total: 0 errors, 1 warnings, 326 lines checked

Patch 10/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
11/16 Checking commit 7b0f43601c81 (monitor: Split out monitor/qmp.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#628: 
new file mode 100644

total: 0 errors, 1 warnings, 984 lines checked

Patch 11/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
12/16 Checking commit 1f84df448bda (monitor: Split out monitor/hmp.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#33: 
new file mode 100644

ERROR: consider using qemu_strtoull in preference to strtoull
#436: FILE: monitor/hmp.c:399:
+        n = strtoull(pch, &p, 0);

total: 1 errors, 1 warnings, 2937 lines checked

Patch 12/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

13/16 Checking commit 61f535a02231 (monitor: Split out monitor/monitor.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#735: 
new file mode 100644

WARNING: Block comments use a leading /* on a separate line
#1370: FILE: monitor/monitor.c:631:
+        { /* end of list */ }

total: 0 errors, 2 warnings, 1317 lines checked

Patch 13/16 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
14/16 Checking commit add28d51ab77 (monitor: Split Monitor.flags into separate bools)
15/16 Checking commit c8d635777789 (monitor: Replace monitor_init() with monitor_init_{hmp, qmp}())
16/16 Checking commit 10cbb82deaa5 (vl: Deprecate -mon pretty=... for HMP monitors)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190617184903.19436-1-armbru@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Patchew URL: https://patchew.org/QEMU/20190617184903.19436-1-armbru@redhat.com/



Hi,

This series failed build test on s390x host. Please find the details below.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with
# HEAD pointing to a commit that has the patches applied on top of "base"
# branch
set -e
CC=$HOME/bin/cc
INSTALL=$PWD/install
BUILD=$PWD/build
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL
make -j4
# XXX: we need reliable clean up
# make check -j4 V=1
make install

echo
echo "=== ENV ==="
env

echo
echo "=== PACKAGES ==="
rpm -qa
=== TEST SCRIPT END ===

  CC      arm-softmmu/hw/block/virtio-blk.o
  CC      alpha-softmmu/hw/char/virtio-serial-bus.o
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c: In function ‘netdev_del_completion’:
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: implicit declaration of function ‘qemu_find_opts_err’; did you mean ‘qemu_find_netdev’? [-Werror=implicit-function-declaration]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~
      |                               qemu_find_netdev
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: nested extern declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: passing argument 1 of ‘qemu_opts_find’ makes pointer from integer without a cast [-Werror=int-conversion]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                               |
---
  CC      aarch64-softmmu/hw/intc/arm_gicv3_cpuif.o
  CC      alpha-softmmu/qapi/qapi-introspect.o
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c: In function ‘netdev_del_completion’:
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: implicit declaration of function ‘qemu_find_opts_err’; did you mean ‘qemu_find_netdev’? [-Werror=implicit-function-declaration]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~
      |                               qemu_find_netdev
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: nested extern declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: passing argument 1 of ‘qemu_opts_find’ makes pointer from integer without a cast [-Werror=int-conversion]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                               |
---
  CC      arm-softmmu/hw/arm/msf2-soc.o
  CC      aarch64-softmmu/qapi/qapi-types.o
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c: In function ‘netdev_del_completion’:
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: implicit declaration of function ‘qemu_find_opts_err’; did you mean ‘qemu_find_netdev’? [-Werror=implicit-function-declaration]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~
      |                               qemu_find_netdev
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: nested extern declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: passing argument 1 of ‘qemu_opts_find’ makes pointer from integer without a cast [-Werror=int-conversion]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                               |
---
  CC      arm-softmmu/qapi/qapi-events.o
  CC      arm-softmmu/qapi/qapi-commands-target.o
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c: In function ‘netdev_del_completion’:
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: implicit declaration of function ‘qemu_find_opts_err’; did you mean ‘qemu_find_netdev’? [-Werror=implicit-function-declaration]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~
      |                               qemu_find_netdev
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: nested extern declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
/var/tmp/patchew-tester-tmp-0lxd7r14/src/monitor/misc.c:2165:31: error: passing argument 1 of ‘qemu_opts_find’ makes pointer from integer without a cast [-Werror=int-conversion]
 2165 |         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
      |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                               |


The full log is available at
http://patchew.org/logs/20190617184903.19436-1-armbru@redhat.com/testing.s390x/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

On Mon, 17 Jun 2019 at 19:51, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit 076243ffe6c1b687e9e6d98348c3bf3398df78f3:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20190617' into staging (2019-06-17 16:41:25 +0100)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2019-06-17
>
> for you to fetch changes up to 092b8737c5e7695c4b9caa3b4eedc66763632755:
>
>   vl: Deprecate -mon pretty=... for HMP monitors (2019-06-17 20:36:56 +0200)
>
> ----------------------------------------------------------------
> Monitor patches for 2019-06-17
>

Hi; I'm afraid this doesn't compile:

Most hosts (ppc64, s390, aarch64, aarch32, osx, and possibly
the others too though they haven't failed immediately) fail
something like this:

/home/pm215/qemu/monitor/misc.c: In function ‘netdev_del_completion’:
/home/pm215/qemu/monitor/misc.c:2165:9: error: implicit declaration of
function ‘qemu_find_opts_err’ [-Werror=implicit-function-declaration]
         opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
         ^
/home/pm215/qemu/monitor/misc.c:2165:9: error: nested extern
declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
/home/pm215/qemu/monitor/misc.c:2165:9: error: passing argument 1 of
‘qemu_opts_find’ makes pointer from integer without a cast [-Werror]
In file included from /home/pm215/qemu/monitor/misc.c:64:0:
/home/pm215/qemu/include/qemu/option.h:105:11: note: expected ‘struct
QemuOptsList *’ but argument is of type ‘int’
 QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);
           ^
cc1: all warnings being treated as errors


windows is a bit different:

/home/petmay01/qemu-for-merges/monitor/hmp.c: In function 'file_completion':
/home/petmay01/qemu-for-merges/monitor/hmp.c:1113:5: error: unknown
type name 'DIR'
     DIR *ffs;
     ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1135:11: error: implicit
declaration of function 'opendir'
[-Werror=implicit-function-declaration]
     ffs = opendir(path);
           ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1135:5: error: nested
extern declaration of 'opendir' [-Werror=nested-externs]
     ffs = opendir(path);
     ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1135:9: error: assignment
makes pointer from integer without a cast [-Werror=int-conversion]
     ffs = opendir(path);
         ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1141:13: error: implicit
declaration of function 'readdir'
[-Werror=implicit-function-declaration]
         d = readdir(ffs);
             ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1141:9: error: nested
extern declaration of 'readdir' [-Werror=nested-externs]
         d = readdir(ffs);
         ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1141:11: error:
assignment makes pointer from integer without a cast
[-Werror=int-conversion]
         d = readdir(ffs);
           ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1146:21: error:
dereferencing pointer to incomplete type 'struct dirent'
         if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
                     ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1166:5: error: implicit
declaration of function 'closedir'
[-Werror=implicit-function-declaration]
     closedir(ffs);
     ^
/home/petmay01/qemu-for-merges/monitor/hmp.c:1166:5: error: nested
extern declaration of 'closedir' [-Werror=nested-externs]

thanks
-- PMM

Peter Maydell <peter.maydell@linaro.org> writes:

> On Mon, 17 Jun 2019 at 19:51, Markus Armbruster <armbru@redhat.com> wrote:
>>
>> The following changes since commit 076243ffe6c1b687e9e6d98348c3bf3398df78f3:
>>
>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-docs-20190617' into staging (2019-06-17 16:41:25 +0100)
>>
>> are available in the Git repository at:
>>
>>   git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2019-06-17
>>
>> for you to fetch changes up to 092b8737c5e7695c4b9caa3b4eedc66763632755:
>>
>>   vl: Deprecate -mon pretty=... for HMP monitors (2019-06-17 20:36:56 +0200)
>>
>> ----------------------------------------------------------------
>> Monitor patches for 2019-06-17
>>
>
> Hi; I'm afraid this doesn't compile:
>
> Most hosts (ppc64, s390, aarch64, aarch32, osx, and possibly
> the others too though they haven't failed immediately) fail
> something like this:
>
> /home/pm215/qemu/monitor/misc.c: In function ‘netdev_del_completion’:
> /home/pm215/qemu/monitor/misc.c:2165:9: error: implicit declaration of
> function ‘qemu_find_opts_err’ [-Werror=implicit-function-declaration]
>          opts = qemu_opts_find(qemu_find_opts_err("netdev", NULL), name);
>          ^
> /home/pm215/qemu/monitor/misc.c:2165:9: error: nested extern
> declaration of ‘qemu_find_opts_err’ [-Werror=nested-externs]
> /home/pm215/qemu/monitor/misc.c:2165:9: error: passing argument 1 of
> ‘qemu_opts_find’ makes pointer from integer without a cast [-Werror]
> In file included from /home/pm215/qemu/monitor/misc.c:64:0:
> /home/pm215/qemu/include/qemu/option.h:105:11: note: expected ‘struct
> QemuOptsList *’ but argument is of type ‘int’
>  QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);
>            ^
> cc1: all warnings being treated as errors

Yup, my fault: I fell into the trap laid by include/ui/qemu-spice.h,
which includes qemu/config-file.h only when CONFIG_SPICE.

> windows is a bit different:
>
> /home/petmay01/qemu-for-merges/monitor/hmp.c: In function 'file_completion':
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1113:5: error: unknown
> type name 'DIR'
>      DIR *ffs;
>      ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1135:11: error: implicit
> declaration of function 'opendir'
> [-Werror=implicit-function-declaration]
>      ffs = opendir(path);
>            ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1135:5: error: nested
> extern declaration of 'opendir' [-Werror=nested-externs]
>      ffs = opendir(path);
>      ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1135:9: error: assignment
> makes pointer from integer without a cast [-Werror=int-conversion]
>      ffs = opendir(path);
>          ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1141:13: error: implicit
> declaration of function 'readdir'
> [-Werror=implicit-function-declaration]
>          d = readdir(ffs);
>              ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1141:9: error: nested
> extern declaration of 'readdir' [-Werror=nested-externs]
>          d = readdir(ffs);
>          ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1141:11: error:
> assignment makes pointer from integer without a cast
> [-Werror=int-conversion]
>          d = readdir(ffs);
>            ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1146:21: error:
> dereferencing pointer to incomplete type 'struct dirent'
>          if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
>                      ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1166:5: error: implicit
> declaration of function 'closedir'
> [-Werror=implicit-function-declaration]
>      closedir(ffs);
>      ^
> /home/petmay01/qemu-for-merges/monitor/hmp.c:1166:5: error: nested
> extern declaration of 'closedir' [-Werror=nested-externs]

Here, Kevin fell into the trap laid by GLib, which includes <dirent.h>
only #ifdef G_OS_UNIX.

v2 coming up.