| Message ID | 1399482202-22544-1-git-send-email-mjt@msgid.tls.msk.ru |
|---|---|
| State | New |
| Headers | show |
07.05.2014 21:03, Michael Tokarev wrote: > Another pull request for trivial patches. It is the same as previous > (2014-05-05) but without the problematic Makefile patch. > > So I'm not resending all the individual patches, as they're the same. On change actually appeared. I had to resolve a trivial conflict in arch_init: Be sure of only one exit entry with DPRINTF() for ram_load() This happens after this commit: commit 21a246a43b606ee833f907d589d8dcbb54a2761e Author: ChenLiang <chenliang88@huawei.com> Date: Fri Apr 25 17:06:20 2014 +0800 migration: remove duplicate code version_id is checked twice in the ram_load. > Thanks, > > /mjt
On 7 May 2014 18:03, Michael Tokarev <mjt@tls.msk.ru> wrote: > Another pull request for trivial patches. It is the same as previous > (2014-05-05) but without the problematic Makefile patch. > > So I'm not resending all the individual patches, as they're the same. > > Thanks, > > /mjt > > The following changes since commit 8d1dc5d188b84a2b2aeb9bd39fddb3d2c67be60c: > > Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140507' into staging (2014-05-07 16:06:38 +0100) > > are available in the git repository at: > > > git://git.corpit.ru/qemu.git tags/trivial-patches-2014-05-07 > > for you to fetch changes up to 8e25c274ae5830cf879fa5d2d7f98f4d6f5aecfa: > > libcacard: remove unnecessary EOL from debug prints (2014-05-07 21:00:44 +0400) Applied, thanks. -- PMM
Another pull request for trivial patches. It is the same as previous (2014-05-05) but without the problematic Makefile patch. So I'm not resending all the individual patches, as they're the same. Thanks, /mjt The following changes since commit 8d1dc5d188b84a2b2aeb9bd39fddb3d2c67be60c: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140507' into staging (2014-05-07 16:06:38 +0100) are available in the git repository at: git://git.corpit.ru/qemu.git tags/trivial-patches-2014-05-07 for you to fetch changes up to 8e25c274ae5830cf879fa5d2d7f98f4d6f5aecfa: libcacard: remove unnecessary EOL from debug prints (2014-05-07 21:00:44 +0400) ---------------------------------------------------------------- trivial patches for 2014-05-07 ---------------------------------------------------------------- Alon Levy (1): libcacard: remove unnecessary EOL from debug prints Chen Gang (1): arch_init: Be sure of only one exit entry with DPRINTF() for ram_load() Fam Zheng (1): docs/memory.txt: Fix document on MMIO operations Hani Benhabiles (1): readline: Sort completions before printing them. Jim Meyering (1): xen: remove unused global, xen_xcg Michael Tokarev (5): configure: remove bashism do not call g_thread_init() for glib >= 2.31 libcacard: replace pstrcpy() with memcpy() qmp: report path ambiguity error readline: use g_strndup instead of open-coding it Peter Maydell (1): tests/tcg: Fix compilation of test_path Stefan Hajnoczi (1): glib: move g_poll() replacement into glib-compat.h Stefan Weil (9): qga: Fix typo (plural) in comment hw/9pfs: Add missing 'static' attributes hw/mips: Add missing 'static' and 'const' attributes hw/s390x: Add missing 'static' attribute monitor: Add missing 'static' attribute ui: Add missing 'static' attribute qemu-timer: Add missing 'static' attribute hw: Add missing 'static' attributes hw/9pfs: Add include file for exported symbol arch_init.c | 12 ++++++++---- configure | 2 +- coroutine-gthread.c | 7 ++----- docs/memory.txt | 10 +++++----- hw/9pfs/virtio-9p-local.c | 1 + hw/9pfs/virtio-9p-synth.c | 2 +- hw/core/qdev.c | 4 ++-- hw/mips/mips_fulong2e.c | 2 +- hw/net/cadence_gem.c | 2 +- hw/net/vmxnet3.c | 6 +++--- hw/net/xgmac.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_rtas.c | 2 +- hw/s390x/event-facility.c | 2 +- hw/scsi/scsi-bus.c | 2 +- hw/xen/xen_backend.c | 1 - include/exec/memory.h | 2 +- include/glib-compat.h | 12 ++++++++++++ include/qemu-common.h | 12 ------------ libcacard/vcard_emul_nss.c | 3 ++- libcacard/vreader.c | 4 ++-- monitor.c | 2 +- qemu-timer.c | 2 +- qga/main.c | 2 +- qmp.c | 6 +++++- tests/tcg/Makefile | 2 -- tests/tcg/test_path.c | 7 ------- ui/console.c | 2 +- util/osdep.c | 21 +++++++++------------ util/readline.c | 11 ++++++++--- 30 files changed, 73 insertions(+), 74 deletions(-)