[Qemu-commits] [qemu/qemu] a5ebc0: tests: Add missing include to test-bitops.c

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a5ebc0ebae1d2283cfec4170b1a04317f2faee74
      
https://github.com/qemu/qemu/commit/a5ebc0ebae1d2283cfec4170b1a04317f2faee74
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M tests/test-bitops.c

  Log Message:
  -----------
  tests: Add missing include to test-bitops.c

The test code needs osdep.h for the ARRAY_SIZE macro.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: afeeead1bcd1080a621500240ea74ec433b21885
      
https://github.com/qemu/qemu/commit/afeeead1bcd1080a621500240ea74ec433b21885
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M include/qemu/bitops.h

  Log Message:
  -----------
  bitops.h: Don't include qemu-common.h

This removes the following circular dependency:

bitops.h -> qemu-common.h -> target-i386/cpu.h -> target-i386/cpu-qom.h ->
qom/cpu.h -> qdev-core.h -> bitmap.h -> bitops.h.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d6aaddfe977417e3df4fc8a0fc0b4cc015909b84
      
https://github.com/qemu/qemu/commit/d6aaddfe977417e3df4fc8a0fc0b4cc015909b84
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M include/qemu/bitmap.h

  Log Message:
  -----------
  bitmap.h: Don't include qemu-common.h

This will avoid unexpected circular header dependencies in the future.

Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 11693a6cf0c3fac2e0ad64f06978095f85f0ec8a
      
https://github.com/qemu/qemu/commit/11693a6cf0c3fac2e0ad64f06978095f85f0ec8a
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M target-xtensa/core-dc232b.c
    M target-xtensa/core-dc233c.c
    M target-xtensa/core-fsf.c

  Log Message:
  -----------
  target-xtensa: mark XtensaConfig structs as unused

The XtensaConfig structs will be defined but not used if they are
for the opposite endianness from that of the binary being built;
keep the compiler from complaining about this by marking them
with the 'unused' attribute.

Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Max Filippov <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 0d61f18b57432e56340b2fabe01222fc464fe92a
      
https://github.com/qemu/qemu/commit/0d61f18b57432e56340b2fabe01222fc464fe92a
  Author: Alex Bennée <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M target-arm/translate-a64.c

  Log Message:
  -----------
  target-arm: A64: remove redundant store

There is not much point storing the same value twice in a row.

Reported-by: Laurent Desnogues <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Laurent Desnogues <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2944d742f73d78120151fbc62b53f2ab79be89aa
      
https://github.com/qemu/qemu/commit/2944d742f73d78120151fbc62b53f2ab79be89aa
  Author: Gerd Hoffmann <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  sparse: fix build

c++ compiler isn't wrapped with cgcc, resulting in gcc complaining about
the sparse compiler flags which it doesn't know in case qemu is built
with --enable-sparse.

Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 404ac83efd5761c6b590fd9f00fbbe8ee2281aa6
      
https://github.com/qemu/qemu/commit/404ac83efd5761c6b590fd9f00fbbe8ee2281aa6
  Author: Michal Privoznik <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M util/oslib-posix.c

  Log Message:
  -----------
  util: Improve os_mem_prealloc error message

Currently, when the preallocating guest memory process fails, a not
so helpful error message is printed out:

    # virsh start migt10
    error: Failed to start domain migt10
    error: internal error: process exited while connecting to monitor:
    os_mem_prealloc: failed to preallocate pages

>From the error message it's not clear at the first glance where the
problem lies. However, changing the error message might give users a
clue.

Signed-off-by: Michal Privoznik <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2fd7ae36c5403b14e9c676627a1a0dd2b76b9e1b
      
https://github.com/qemu/qemu/commit/2fd7ae36c5403b14e9c676627a1a0dd2b76b9e1b
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M os-posix.c

  Log Message:
  -----------
  Revert "os-posix: report error message when lock file failed"

This reverts commit e5048d15ce6addae869f23514b2a1f0d4466418a.

qemu_create_pidfile() is only created from main(), and there,
if that function returns failure, os_pidfile_error() function
is called, to, guess that, report error (which is done differently
whenever we're daemonizing or not).

qemu_create_pidfile() function has several error returns, this
lockf() failure is one of them, there are others (another shown
in the patch context too).

So this patch makes whole thing inconsistent at least.

If we need to show error message when we're daemonizing, it
looks like we should modify os_pidfile_error() routine to always
report error and only after that check for daemon mode.  This way
all errors will be reported the same way.

Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 44d8d2b2ddbaa3ee4125ec6cb2e8691e6348b01e
      
https://github.com/qemu/qemu/commit/44d8d2b2ddbaa3ee4125ec6cb2e8691e6348b01e
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  net/slirp: specify logbase for smbd

It looks like smbd always logs to /var/log/samba/log.$progname
even if config file specifies different logfile -- when it needs
to log something before completing reading the config file.  But
if it can't open it for writing, it fails and exits.  Tell smbd
to use our temp dir as logbase (-l option) to avoid that.

The same option is used by samba3 and samba4, so there should
be no incompatible changes.

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Tested-by: Jan Kiszka <address@hidden>


  Commit: 8ef2b256b94696a3a4bd8aa69a2b0fd7bc246f07
      
https://github.com/qemu/qemu/commit/8ef2b256b94696a3a4bd8aa69a2b0fd7bc246f07
  Author: zhanghailiang <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M hw/tricore/tricore_testboard.c

  Log Message:
  -----------
  target-tricore: check return value before using it

We reference the return value of cpu before checking whether it is NULL,
The checking code is after that which violates code style.

It makes no difference if the cpu is NULL, qemu process will terminate.
But one will be 'Segmentation fault' and the other will report a error
which is what we want.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Bastian Koppelmann <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 660edd4eda903e32811a4929d1434cceda3284aa
      
https://github.com/qemu/qemu/commit/660edd4eda903e32811a4929d1434cceda3284aa
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M hw/9pfs/virtio-9p-proxy.c

  Log Message:
  -----------
  virtio-9p-proxy: Fix sockfd leak

If connect() in connect_namedsocket() return false, the sockfd will leak.
Plug it.

Signed-off-by: Michael Tokarev <address@hidden>
Signed-off-by: Gonglei <address@hidden>


  Commit: 6af76c6f7dbcc6255f5a5cac20ad61d1492d4052
      
https://github.com/qemu/qemu/commit/6af76c6f7dbcc6255f5a5cac20ad61d1492d4052
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M hw/9pfs/virtio-9p-proxy.c

  Log Message:
  -----------
  virtio-9p-proxy: fix error return in proxy_init()

proxy_init() does not check the return value of connect_namedsocket(),
fix this by rearranging code a little bit.

Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7d5a8435baed70f03bbe791aba12f5586ba17d75
      
https://github.com/qemu/qemu/commit/7d5a8435baed70f03bbe791aba12f5586ba17d75
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M hw/9pfs/virtio-9p-proxy.c

  Log Message:
  -----------
  virtio-9p-proxy: improve error messages in connect_namedsocket()

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: 08a655be71d0a130a5d9bf7816d096ec31c4f055
      
https://github.com/qemu/qemu/commit/08a655be71d0a130a5d9bf7816d096ec31c4f055
  Author: Gonglei <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M dump.c

  Log Message:
  -----------
  dump: Fix dump-guest-memory termination and use-after-close

dump_iterate() dumps blocks in a loop.  Eventually, get_next_block()
returns "no more".  We then call dump_completed().  But we neglect to
break the loop!  Broken in commit 4c7e251a.

Because of that, we dump the last block again.  This attempts to write
to s->fd, which fails if we're lucky.  The error makes dump_iterate()
return failure.  It's the only way it can ever return.

Theoretical: if we're not so lucky, something else has opened something
for writing and got the same fd.  dump_iterate() then keeps looping,
messing up the something else's output, until a write fails, or the
process mercifully terminates.

The obvious fix is to restore the return lost in commit 4c7e251a.  But
the root cause of the bug is needlessly opaque loop control.  Replace it
by a clean do ... while loop.

This makes the badly chosen return values of get_next_block() more
visible.  Cleaning that up is outside the scope of this bug fix.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 0be5e436ff2cd6b8a1ff6782e3cfd09441ff3ec7
      
https://github.com/qemu/qemu/commit/0be5e436ff2cd6b8a1ff6782e3cfd09441ff3ec7
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M os-posix.c

  Log Message:
  -----------
  os-posix: use global daemon_pipe instead of cryptic fds[1]

When asked to -daemonize, we fork a child and setup a pipe between
it and parent to pass exit status.  os-posix.c used global fds[2]
array for that, but actually only the writing side of the pipe is
needed to be global, and this name is really too generic.  Use
just one interger for the writing side of the pipe, and name it
daemon_pipe to be more understandable than cryptic fds[1].

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: ccea25f1c7cd3f0b12d878a5294620f5478729f8
      
https://github.com/qemu/qemu/commit/ccea25f1c7cd3f0b12d878a5294620f5478729f8
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M os-posix.c

  Log Message:
  -----------
  os-posix: replace goto again with a proper loop

Eliminiate two fullwrite implementations with goto replacing them with
a proper do..while loop.

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: fee78fd6d2f8dfdfd447a33c34323dd5bd3193a2
      
https://github.com/qemu/qemu/commit/fee78fd6d2f8dfdfd447a33c34323dd5bd3193a2
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M include/qemu-common.h
    M os-posix.c
    M os-win32.c
    M vl.c

  Log Message:
  -----------
  pidfile: stop making pidfile error a special case

In case of -daemonize, we write non-zero to the daemon
pipe only if pidfile creation failed, so the parent will
report error about pidfile problem.  There's no need to
make special case for this, since all other errors are
reported by the child just fine.  Let the parent report
error and simplify logic in os_daemonize().

This way, we don't need os_pidfile_error() function, since
it only prints error now, so put the error reporting printf
into the only place where qemu_create_pidfile() is called,
in vl.c.

While at it, fix wrong indentation in os_daemonize().

Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 25cec2b896a977565ca04e5c649aab8c6e48bda8
      
https://github.com/qemu/qemu/commit/25cec2b896a977565ca04e5c649aab8c6e48bda8
  Author: Michael Tokarev <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M os-posix.c

  Log Message:
  -----------
  os-posix: reorder parent notification for -daemonize

Put "success" parent reporting in os_setup_post() to after
all other initializers which may also fail, to the very end,
so more possible failure cases are reported properly to the
calling process.

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: b391567b64c86d3c032b500eebb7c53d332fc5f2
      
https://github.com/qemu/qemu/commit/b391567b64c86d3c032b500eebb7c53d332fc5f2
  Author: Gonglei <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M net/tap_int.h

  Log Message:
  -----------
  tap_int.h: remove repeating NETWORK_SCRIPT defines

DEFAULT_NETWORK_SCRIPT and DEFAULT_NETWORK_DOWN_SCRIPT
have been defined in net/net.h included in
tap.c, which is the only C file that using those two macro.
Let's remove the repeating macroinstruction.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: bb019cf911ee4a152e3b31940d702d7b8a8b8114
      
https://github.com/qemu/qemu/commit/bb019cf911ee4a152e3b31940d702d7b8a8b8114
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Remove unused model_features_t struct

The struct is not used anymore and can be removed.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d0caa3eb539de01043354440ce0a10b1f546cf06
      
https://github.com/qemu/qemu/commit/d0caa3eb539de01043354440ce0a10b1f546cf06
  Author: Gonglei <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: do not close(fd) in net_init_tap_one

commit 5193e5fb (tap: factor out common tap initialization)
introduce net_init_tap_one(). But it's inappropriate that
we close fd in net_init_tap_one(), we should lay it in the
caller, becuase some callers needn't to close it if we get
the fd by monitor_handle_fd_param().

On the other hand, in other exceptional branches fd isn't
closed, so that's incomplete anyway.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 84f8f3dace8c6e88b1afa828f9abe1e9a57fac1a
      
https://github.com/qemu/qemu/commit/84f8f3dace8c6e88b1afa828f9abe1e9a57fac1a
  Author: Gonglei <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: fix possible fd leak in net_init_tap

In hotplugging scenario, taking those true branch, the file
handler do not be closed. Let's close them before return.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f18a768efb990d9cd02911159de02e8ff5475239
      
https://github.com/qemu/qemu/commit/f18a768efb990d9cd02911159de02e8ff5475239
  Author: SeokYeon Hwang <address@hidden>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  vdi: wrapped uuid_unparse() in #ifdef

Wrapped uuid_unparse() in #ifdef to avoid "-Wunused-function"
on clang 3.4 or later.

Signed-off-by: SeokYeon Hwang <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7135781f65f1267a72bf554ee2b7bd605f9e59aa
      
https://github.com/qemu/qemu/commit/7135781f65f1267a72bf554ee2b7bd605f9e59aa
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M block/vdi.c
    M configure
    M dump.c
    M hw/9pfs/virtio-9p-proxy.c
    M hw/tricore/tricore_testboard.c
    M include/qemu-common.h
    M include/qemu/bitmap.h
    M include/qemu/bitops.h
    M net/slirp.c
    M net/tap.c
    M net/tap_int.h
    M os-posix.c
    M os-win32.c
    M target-arm/translate-a64.c
    M target-i386/cpu.c
    M target-xtensa/core-dc232b.c
    M target-xtensa/core-dc233c.c
    M target-xtensa/core-fsf.c
    M tests/test-bitops.c
    M util/oslib-posix.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into staging

trivial patches for 2014-11-02

# gpg: Signature made Sun 02 Nov 2014 11:54:43 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"

* remotes/mjt/tags/pull-trivial-patches-2014-11-02: (23 commits)
  vdi: wrapped uuid_unparse() in #ifdef
  tap: fix possible fd leak in net_init_tap
  tap: do not close(fd) in net_init_tap_one
  target-i386: Remove unused model_features_t struct
  tap_int.h: remove repeating NETWORK_SCRIPT defines
  os-posix: reorder parent notification for -daemonize
  pidfile: stop making pidfile error a special case
  os-posix: replace goto again with a proper loop
  os-posix: use global daemon_pipe instead of cryptic fds[1]
  dump: Fix dump-guest-memory termination and use-after-close
  virtio-9p-proxy: improve error messages in connect_namedsocket()
  virtio-9p-proxy: fix error return in proxy_init()
  virtio-9p-proxy: Fix sockfd leak
  target-tricore: check return value before using it
  net/slirp: specify logbase for smbd
  Revert "os-posix: report error message when lock file failed"
  util: Improve os_mem_prealloc error message
  sparse: fix build
  target-arm: A64: remove redundant store
  target-xtensa: mark XtensaConfig structs as unused
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f67d23b1ae32...7135781f65f1