| Message ID | 1453820420-68329-1-git-send-email-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 26 January 2016 at 15:00, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 3db34bf64ab4f8797565dd8750003156c32b301d: > > Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2016-01-18 17:40:50 +0000) > > are available in the git repository at: > > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 28fbf8f67b078f738e790f3c3a56aeab2c0ea5d6: > > scripts/dump-guest-memory.py: Fix module docstring (2016-01-26 15:58:14 +0100) > > ---------------------------------------------------------------- > * 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 > Applied, thanks. -- PMM
diff --git a/qemu-char.c b/qemu-char.c index ca53e8c..c88272b 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -887,6 +887,7 @@ static void remove_fd_in_watch(CharDriverState *chr) } +#ifndef _WIN32 static int io_channel_send_full(QIOChannel *ioc, const void *buf, size_t len, int *fds, size_t nfds) @@ -920,7 +921,6 @@ static int io_channel_send_full(QIOChannel *ioc, } -#ifndef _WIN32 static int io_channel_send(QIOChannel *ioc, const void *buf, size_t len) { return io_channel_send_full(ioc, buf, len, NULL, 0);
The following changes since commit 3db34bf64ab4f8797565dd8750003156c32b301d: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging (2016-01-18 17:40:50 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 28fbf8f67b078f738e790f3c3a56aeab2c0ea5d6: scripts/dump-guest-memory.py: Fix module docstring (2016-01-26 15:58:14 +0100) ---------------------------------------------------------------- * 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 ---------------------------------------------------------------- Daniel P. Berrange (4): char: remove fixed length filename allocation char: convert from GIOChannel to QIOChannel char: don't assume telnet initialization will not block char: introduce support for TLS encrypted TCP chardev backend Denis V. Lunev (1): nbd: add missed aio_context_acquire in nbd_export_new Dr. David Alan Gilbert (1): cpus: use broadcast on qemu_pause_cond Janosch Frank (40): scripts/kvm/kvm_stat: Cleanup of multiple imports scripts/kvm/kvm_stat: Replaced os.listdir with os.walk scripts/kvm/kvm_stat: Make constants uppercase scripts/kvm/kvm_stat: Removed unneeded PERF constants scripts/kvm/kvm_stat: Mark globals in functions scripts/kvm/kvm_stat: Invert dictionaries scripts/kvm/kvm_stat: Cleanup of path variables scripts/kvm/kvm_stat: Improve debugfs access checking scripts/kvm/kvm_stat: Introduce main function scripts/kvm/kvm_stat: Fix spaces around keyword assignments scripts/kvm/kvm_stat: Rename variables that redefine globals scripts/kvm/kvm_stat: Moved DebugfsProvider scripts/kvm/kvm_stat: Fixup syscall error reporting scripts/kvm/kvm_stat: Set sensible no. files rlimit scripts/kvm/kvm_stat: Cleanup of platform detection scripts/kvm/kvm_stat: Make cpu detection a function scripts/kvm/kvm_stat: Rename _perf_event_open scripts/kvm/kvm_stat: Introduce properties for providers scripts/kvm/kvm_stat: Cleanup of TracepointProvider scripts/kvm/kvm_stat: Cleanup cpu list retrieval scripts/kvm/kvm_stat: Encapsulate filters variable scripts/kvm/kvm_stat: Cleanup of Stats class scripts/kvm/kvm_stat: Cleanup of Groups class scripts/kvm/kvm_stat: Cleanup of Event class scripts/kvm/kvm_stat: Group arch specific data scripts/kvm/kvm_stat: Remove unneeded X86_EXIT_REASONS scripts/kvm/kvm_stat: Make tui function a class scripts/kvm/kvm_stat: Fix output formatting scripts/kvm/kvm_stat: Cleanup and pre-init perf_event_attr scripts/kvm/kvm_stat: Read event values as u64 scripts/kvm/kvm_stat: Fix rlimit for unprivileged users scripts/kvm/kvm_stat: Fixup filtering scripts/kvm/kvm_stat: Add interactive filtering scripts/kvm/kvm_stat: Add optparse description scripts/dump-guest-memory.py: Move constants to the top scripts/dump-guest-memory.py: Make methods functions scripts/dump-guest-memory.py: Improve python 3 compatibility scripts/dump-guest-memory.py: Cleanup functions scripts/dump-guest-memory.py: Introduce multi-arch support scripts/dump-guest-memory.py: Fix module docstring Luiz Capitulino (1): memory: exit when hugepage allocation fails if mem-prealloc Paolo Bonzini (1): qemu-char: avoid leak in qemu_chr_open_pp_fd Sitsofe Wheeler (1): docs: Style the command and its options in the synopsis cpus.c | 4 +- fsdev/virtfs-proxy-helper.texi | 2 +- nbd/server.c | 2 + numa.c | 11 +- qapi-schema.json | 2 + qemu-char.c | 926 ++++++++++++++++--------------- qemu-doc.texi | 8 +- qemu-ga.texi | 2 +- qemu-img.texi | 2 +- qemu-options.hx | 9 +- scripts/dump-guest-memory.py | 762 +++++++++++++++---------- scripts/kvm/kvm_stat | 1199 +++++++++++++++++++++++----------------- tests/Makefile | 2 +- 13 files changed, 1663 insertions(+), 1268 deletions(-)