diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 07:49:21 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-15 07:49:22 -0500 |
commit | c530b1423b86f1589c49bccb460a75cb87322562 (patch) | |
tree | aa44a2532469cf3d4d5a29c34f1397bc6eefc07a /savevm.c | |
parent | b25ce104a2ea690d77b1803cc829fee3142b310d (diff) | |
parent | c85a128480a3d05d2002728c449a32e32663e7de (diff) |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Michal Novotny (2) and Eric Blake (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
qapi: use valid JSON in schema
Revert "New QMP command query-cpu-max and HMP command cpu_max"
New cpu-max field in query-machines QMP command output
Message-id: 1365775103-18737-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'savevm.c')
0 files changed, 0 insertions, 0 deletions