[PULL,00/10] QMP queue
mbox

Message ID 1431092051-31046-1-git-send-email-lcapitulino@redhat.com
State New
Headers show

Pull-request

git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream

Message

Luiz Capitulino May 8, 2015, 1:34 p.m. UTC
The following changes since commit f8340b360b9bc29d48716ba8aca79df2b9544979:

  hw/ptimer: Do not artificially limit timers when using icount (2015-05-08 17:15:23 +1000)

are available in the git repository at:

  git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream

for you to fetch changes up to 07972d16e3343dc62302b81efb018308f99f7a7a:

  scripts: qmp-shell: Add verbose flag (2015-05-08 08:47:01 -0400)

----------------------------------------------------------------
QMP pull request

----------------------------------------------------------------
Claudio Fontana (1):
      monitor: add memory search commands s, sp

Eduardo Habkost (1):
      QJSON: Use OBJECT_CHECK

Eric Blake (1):
      json-parser: Accept 'null' in QMP

John Snow (4):
      scripts: qmp-shell: refactor helpers
      scripts: qmp-shell: Expand support for QMP expressions
      scripts: qmp-shell: add transaction subshell
      scripts: qmp-shell: Add verbose flag

Luiz Capitulino (1):
      MAINTAINERS: New maintainer for QMP and QAPI

Markus Armbruster (2):
      qobject: Clean up around qtype_code
      qobject: Add a special null QObject

 MAINTAINERS                |  18 +++---
 block/qapi.c               |   3 -
 hmp-commands.hx            |  28 +++++++++
 include/hw/qdev-core.h     |   2 +-
 include/qapi/qmp/qobject.h |  13 +++-
 monitor.c                  | 140 ++++++++++++++++++++++++++++++++++++++++++
 qjson.c                    |  10 +--
 qobject/Makefile.objs      |   2 +-
 qobject/json-parser.c      |   2 +
 qobject/qjson.c            |   6 +-
 qobject/qnull.c            |  29 +++++++++
 scripts/qmp/qmp-shell      | 147 +++++++++++++++++++++++++++++++++++----------
 tests/check-qjson.c        |  15 ++++-
 13 files changed, 359 insertions(+), 56 deletions(-)
 create mode 100644 qobject/qnull.c

Comments

Peter Maydell May 11, 2015, 12:53 p.m. UTC | #1
On 8 May 2015 at 14:34, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit f8340b360b9bc29d48716ba8aca79df2b9544979:
>
>   hw/ptimer: Do not artificially limit timers when using icount (2015-05-08 17:15:23 +1000)
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream
>
> for you to fetch changes up to 07972d16e3343dc62302b81efb018308f99f7a7a:
>
>   scripts: qmp-shell: Add verbose flag (2015-05-08 08:47:01 -0400)
>
> ----------------------------------------------------------------
> QMP pull request

Hi. I'm afraid this doesn't build on win32:
/home/petmay01/linaro/qemu-for-merges/monitor.c: In function ‘memory_search’:
/home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
implicit declaration of function ‘memmem’
/home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning: nested
extern declaration of ‘memmem’
/home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
assignment makes pointer from integer

thanks
-- PMM
Luiz Capitulino May 11, 2015, 1:17 p.m. UTC | #2
On Mon, 11 May 2015 13:53:47 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:

> On 8 May 2015 at 14:34, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> > The following changes since commit f8340b360b9bc29d48716ba8aca79df2b9544979:
> >
> >   hw/ptimer: Do not artificially limit timers when using icount (2015-05-08 17:15:23 +1000)
> >
> > are available in the git repository at:
> >
> >   git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream
> >
> > for you to fetch changes up to 07972d16e3343dc62302b81efb018308f99f7a7a:
> >
> >   scripts: qmp-shell: Add verbose flag (2015-05-08 08:47:01 -0400)
> >
> > ----------------------------------------------------------------
> > QMP pull request
> 
> Hi. I'm afraid this doesn't build on win32:
> /home/petmay01/linaro/qemu-for-merges/monitor.c: In function ‘memory_search’:
> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
> implicit declaration of function ‘memmem’
> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning: nested
> extern declaration of ‘memmem’
> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
> assignment makes pointer from integer

Needless to say that I didn't build for win32. My bad.

Can you try again? I've dropped the offending patch and pushed
the tag again.
Peter Maydell May 12, 2015, 9:40 a.m. UTC | #3
On 11 May 2015 at 14:17, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> On Mon, 11 May 2015 13:53:47 +0100
> Peter Maydell <peter.maydell@linaro.org> wrote:
>
>> On 8 May 2015 at 14:34, Luiz Capitulino <lcapitulino@redhat.com> wrote:
>> > The following changes since commit f8340b360b9bc29d48716ba8aca79df2b9544979:
>> >
>> >   hw/ptimer: Do not artificially limit timers when using icount (2015-05-08 17:15:23 +1000)
>> >
>> > are available in the git repository at:
>> >
>> >   git://repo.or.cz/qemu/qmp-unstable.git tags/for-upstream
>> >
>> > for you to fetch changes up to 07972d16e3343dc62302b81efb018308f99f7a7a:
>> >
>> >   scripts: qmp-shell: Add verbose flag (2015-05-08 08:47:01 -0400)
>> >
>> > ----------------------------------------------------------------
>> > QMP pull request
>>
>> Hi. I'm afraid this doesn't build on win32:
>> /home/petmay01/linaro/qemu-for-merges/monitor.c: In function ‘memory_search’:
>> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
>> implicit declaration of function ‘memmem’
>> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning: nested
>> extern declaration of ‘memmem’
>> /home/petmay01/linaro/qemu-for-merges/monitor.c:1306: warning:
>> assignment makes pointer from integer
>
> Needless to say that I didn't build for win32. My bad.
>
> Can you try again? I've dropped the offending patch and pushed
> the tag again.

Applied, thanks.

-- PMM