| Message ID | 1425290934-60872-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03/02/2015 03:08 AM, Paolo Bonzini wrote: > The following changes since commit 041ccc922ee474693a2869d4e3b59e920c739bc0: > > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2015-02-26 12:16:46 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > Michael S. Tsirkin (2): > Makefile: don't silence mak file test with V=1 Is there still time to fix this typo?
On 02/03/2015 17:09, Eric Blake wrote: >> Michael S. Tsirkin (2): Makefile: don't silence mak file test >> with V=1 > > Is there still time to fix this typo? I don't think it is a typo, is it? Paolo
On 03/02/2015 09:23 AM, Paolo Bonzini wrote: > > > On 02/03/2015 17:09, Eric Blake wrote: >>> Michael S. Tsirkin (2): Makefile: don't silence mak file test >>> with V=1 >> >> Is there still time to fix this typo? > > I don't think it is a typo, is it? When I saw it, I thought s/mak/make/. But looking at the patch, maybe a better correction would be s/mak/.mak/ to make it obvious that we are talking about a literal '.mak' suffix and not a typo for 'make'. Feel free to ignore me on this one.
On 2 March 2015 at 19:08, Paolo Bonzini <pbonzini@redhat.com> wrote: > The following changes since commit 041ccc922ee474693a2869d4e3b59e920c739bc0: > > Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2015-02-26 12:16:46 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 21618b3e55ad2c6fede0bffcaea466091811ce59: > > cpus: be more paranoid in avoiding deadlocks (2015-03-02 10:57:07 +0100) > > ---------------------------------------------------------------- > - more config options > - bootdevice, iscsi, virtio-scsi fixes > - build system patches for MinGW and config-devices.mak > - qemu_mutex_lock_iothread deadlock fixes > - another tiny patch from the record/replay series > > ---------------------------------------------------------------- Applied, thanks. -- PMM
The following changes since commit 041ccc922ee474693a2869d4e3b59e920c739bc0: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2015-02-26 12:16:46 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 21618b3e55ad2c6fede0bffcaea466091811ce59: cpus: be more paranoid in avoiding deadlocks (2015-03-02 10:57:07 +0100) ---------------------------------------------------------------- - more config options - bootdevice, iscsi, virtio-scsi fixes - build system patches for MinGW and config-devices.mak - qemu_mutex_lock_iothread deadlock fixes - another tiny patch from the record/replay series ---------------------------------------------------------------- David Gibson (3): Add specific config options for PCI-E bridges Create specific config option for "platform-bus" Give ivshmem its own config option Fam Zheng (3): block: Forbid bdrv_set_aio_context outside BQL virtio-scsi-dataplane: Call blk_set_aio_context within BQL iscsi: Handle write protected case in reopen Gonglei (1): bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd' Max Reitz (1): virtio-scsi: Allocate op blocker reason before blocking Michael S. Tsirkin (2): Makefile: don't silence mak file test with V=1 Makefile.target: binary depends on config-devices Paolo Bonzini (3): scsi: give device a parent before setting properties cpus: fix deadlock and segfault in qemu_mutex_lock_iothread cpus: be more paranoid in avoiding deadlocks Pavel Dovgalyuk (1): timer: replace time() with QEMU_CLOCK_HOST Vasily Efimov (1): Makefile: fix up parallel building under MSYS+MinGW Makefile | 10 +++++----- Makefile.target | 4 +++- block/iscsi.c | 20 +++++++++++--------- bootdevice.c | 13 +++++++++---- cpus.c | 12 ++++++++---- default-configs/arm-softmmu.mak | 5 +++++ default-configs/i386-softmmu.mak | 3 +++ default-configs/pci.mak | 1 + default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 3 +++ hw/core/Makefile.objs | 2 +- hw/misc/Makefile.objs | 4 +--- hw/pci-bridge/Makefile.objs | 5 +++-- hw/scsi/scsi-bus.c | 5 +++++ hw/scsi/virtio-scsi-dataplane.c | 4 ---- hw/scsi/virtio-scsi.c | 19 +++++++++++-------- include/block/block.h | 3 +-- scripts/make_device_config.sh | 2 +- vl.c | 12 ++++++++---- 20 files changed, 81 insertions(+), 48 deletions(-)