Commit ba3fb2f0 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* chardev support for TLS and leak fix
* NBD fix from Denis
* condvar fix from Dave
* kvm_stat and dump-guest-memory almost rewrite
* mem-prealloc fix from Luiz
* manpage style improvement

# gpg: Signature made Tue 26 Jan 2016 14:58:18 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (49 commits)
  scripts/dump-guest-memory.py: Fix module docstring
  scripts/dump-guest-memory.py: Introduce multi-arch support
  scripts/dump-guest-memory.py: Cleanup functions
  scripts/dump-guest-memory.py: Improve python 3 compatibility
  scripts/dump-guest-memory.py: Make methods functions
  scripts/dump-guest-memory.py: Move constants to the top
  nbd: add missed aio_context_acquire in nbd_export_new
  memory: exit when hugepage allocation fails if mem-prealloc
  cpus: use broadcast on qemu_pause_cond
  scripts/kvm/kvm_stat: Add optparse description
  scripts/kvm/kvm_stat: Add interactive filtering
  scripts/kvm/kvm_stat: Fixup filtering
  scripts/kvm/kvm_stat: Fix rlimit for unprivileged users
  scripts/kvm/kvm_stat: Read event values as u64
  scripts/kvm/kvm_stat: Cleanup and pre-init perf_event_attr
  scripts/kvm/kvm_stat: Fix output formatting
  scripts/kvm/kvm_stat: Make tui function a class
  scripts/kvm/kvm_stat: Remove unneeded X86_EXIT_REASONS
  scripts/kvm/kvm_stat: Group arch specific data
  scripts/kvm/kvm_stat: Cleanup of Event class
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1535a6d6 28fbf8f6

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ static void qemu_wait_io_event_common(CPUState *cpu) 
    if (cpu->stop) {

        cpu->stop = false;

        cpu->stopped = true;

        qemu_cond_signal(&qemu_pause_cond);

        qemu_cond_broadcast(&qemu_pause_cond);

    }

    flush_queued_work(cpu);

    cpu->thread_kicked = false;
@@ -1396,7 +1396,7 @@ void cpu_stop_current(void) 
        current_cpu->stop = false;

        current_cpu->stopped = true;

        cpu_exit(current_cpu);

        qemu_cond_signal(&qemu_pause_cond);

        qemu_cond_broadcast(&qemu_pause_cond);

    }

}

fsdev/virtfs-proxy-helper.texi

+1 −1
Original line number Diff line number Diff line 
@example

@c man begin SYNOPSIS

usage: virtfs-proxy-helper options

@command{virtfs-proxy-helper} @var{options}

@c man end

@end example

nbd/server.c

+2 −0
Original line number Diff line number Diff line
@@ -671,7 +671,9 @@ NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size, 
     * that BDRV_O_INACTIVE is cleared and the image is ready for write

     * access since the export could be available before migration handover.

     */

    aio_context_acquire(exp->ctx);

    blk_invalidate_cache(blk, NULL);

    aio_context_release(exp->ctx);

    return exp;



fail:

numa.c

+7 −4
Original line number Diff line number Diff line
@@ -418,12 +418,15 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, 
        Error *err = NULL;

        memory_region_init_ram_from_file(mr, owner, name, ram_size, false,

                                         mem_path, &err);

        if (err) {

            error_report_err(err);

            if (mem_prealloc) {

                exit(1);

            }



            /* Legacy behavior: if allocation failed, fall back to

             * regular RAM allocation.

             */

        if (err) {

            error_report_err(err);

            memory_region_init_ram(mr, owner, name, ram_size, &error_fatal);

        }

#else

qapi-schema.json

+2 −0
Original line number Diff line number Diff line
@@ -3146,6 +3146,7 @@ 
#

# @addr: socket address to listen on (server=true)

#        or connect to (server=false)

# @tls-creds: #optional the ID of the TLS credentials object (since 2.6)

# @server: #optional create server socket (default: true)

# @wait: #optional wait for incoming connection on server

#        sockets (default: false).
@@ -3160,6 +3161,7 @@ 
# Since: 1.4

##

{ 'struct': 'ChardevSocket', 'data': { 'addr'       : 'SocketAddress',

                                     '*tls-creds'  : 'str',

                                     '*server'    : 'bool',

                                     '*wait'      : 'bool',

                                     '*nodelay'   : 'bool',