Re: [Qemu-devel] [PULL 00/20] Miscellaneous patches for 2018-02-07

2018-02-07 Thread Peter Maydell
2018-02-07 12:39 GMT+00:00 Markus Armbruster :
> The following changes since commit 20e0d439a6ded635ec89f6135c08cd5541c68962:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into 
> staging (2018-02-06 14:21:41 +)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-misc-2018-02-07
>
> for you to fetch changes up to 35aeba9964fca0c698352eeebbc9410c3d299c77:
>
>   Move include qemu/option.h from qemu-common.h to actual users (2018-02-07 
> 13:00:03 +0100)
>
> 
> Miscellaneous patches for 2018-02-07
>

Hi. This has a compile issue on OSX:

/Users/pm215/src/qemu-for-merges/block/file-posix.c:2525:28: error:
implicit declaration of function 'qdict_get_str' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
const char *filename = qdict_get_str(options, "filename");
   ^
  CC  block/mirror.o
/Users/pm215/src/qemu-for-merges/block/file-posix.c:2525:17: error:
incompatible integer to pointer conversion initializing 'const char *'
with an expression of type 'int' [-Werror,-Wint-conversion]
const char *filename = qdict_get_str(options, "filename");
^  ~~
/Users/pm215/src/qemu-for-merges/block/file-posix.c:2565:9: error:
implicit declaration of function 'qdict_put_str' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
qdict_put_str(options, "filename", bsd_path);
^
/Users/pm215/src/qemu-for-merges/block/file-posix.c:2565:9: note: did
you mean 'qdict_get_str'?
/Users/pm215/src/qemu-for-merges/block/file-posix.c:2525:28: note:
'qdict_get_str' declared here
const char *filename = qdict_get_str(options, "filename");
   ^
3 errors generated.

(All the other builds went OK.)

thanks
-- PMM



[Qemu-devel] [PULL 00/20] Miscellaneous patches for 2018-02-07

2018-02-07 Thread Markus Armbruster
The following changes since commit 20e0d439a6ded635ec89f6135c08cd5541c68962:

  Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into 
staging (2018-02-06 14:21:41 +)

are available in the git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-misc-2018-02-07

for you to fetch changes up to 35aeba9964fca0c698352eeebbc9410c3d299c77:

  Move include qemu/option.h from qemu-common.h to actual users (2018-02-07 
13:00:03 +0100)


Miscellaneous patches for 2018-02-07


Gerd Hoffmann (1):
  vnc: use stubs for CONFIG_VNC=n dummy functions

Markus Armbruster (19):
  Use #include "..." for our own headers, <...> for others
  Clean up includes
  Drop superfluous includes of qapi-types.h and test-qapi-types.h
  Include qapi/error.h exactly where needed
  Drop superfluous includes of qapi/qmp/qerror.h
  Include qmp-commands.h exactly where needed
  Typedef the subtypes of QObject in qemu/typedefs.h, too
  Eliminate qapi/qmp/types.h
  qdict qlist: Make most helper macros functions
  Include qapi/qmp/qobject.h exactly where needed
  Include qapi/qmp/qlist.h exactly where needed
  Include qapi/qmp/qdict.h exactly where needed
  Include qapi/qmp/qstring.h exactly where needed
  Include qapi/qmp/qbool.h exactly where needed
  Include qapi/qmp/qnum.h exactly where needed
  Include qapi/qmp/qnull.h exactly where needed
  Drop superfluous includes of qapi/qmp/dispatch.h
  Drop superfluous includes of qapi/qmp/qjson.h
  Move include qemu/option.h from qemu-common.h to actual users

 accel/accel.c  |  2 +-
 audio/wavcapture.c |  1 +
 backends/cryptodev.c   |  1 -
 backends/hostmem.c |  1 -
 backends/tpm.c |  1 -
 balloon.c  |  2 +-
 block.c|  6 --
 block/blkdebug.c   |  2 +-
 block/blkverify.c  |  1 +
 block/block-backend.c  |  2 ++
 block/crypto.c |  2 ++
 block/curl.c   |  5 +++--
 block/file-posix.c |  2 ++
 block/file-win32.c |  3 +++
 block/gluster.c|  3 +++
 block/iscsi-opts.c |  1 +
 block/iscsi.c  |  3 ++-
 block/nbd.c|  2 +-
 block/nfs.c|  2 +-
 block/null.c   |  1 +
 block/parallels.c  |  3 ++-
 block/parallels.h  |  1 -
 block/qapi.c   |  6 +-
 block/qcow.c   |  5 +++--
 block/qcow2-cluster.c  |  1 -
 block/qcow2.c  |  6 --
 block/qed.c|  2 +-
 block/quorum.c |  4 ++--
 block/rbd.c|  3 +++
 block/replication.c|  2 +-
 block/sheepdog.c   |  1 +
 block/snapshot.c   |  2 ++
 block/ssh.c|  2 ++
 block/throttle.c   |  1 +
 block/vdi.c|  1 +
 block/vhdx.c   |  2 +-
 block/vmdk.c   |  1 +
 block/vpc.c|  3 ++-
 block/vvfat.c  |  4 +++-
 block/write-threshold.c|  2 +-
 blockdev-nbd.c |  2 +-
 blockdev.c |  5 -
 blockjob.c |  3 +--
 chardev/char-file.c|  3 ++-
 chardev/char-mux.c |  3 ++-
 chardev/char-parallel.c|  2 ++
 chardev/char-pipe.c|  2 ++
 chardev/char-ringbuf.c |  3 +++
 chardev/char-serial.c  |  2 ++
 chardev/char-socket.c  |  2 ++
 chardev/char-stdio.c   |  3 ++-
 chardev/char-udp.c |  2 ++
 chardev/char.c |  3 +++
 chardev/spice.c|  2 ++