[Qemu-devel] [PULL 0/3] QMP queue

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

The changes (since a8170e5e97ad17ca169c64ba87ae2f53850dab4c) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Aurelien Jarno (1):
  hmp: fix info cpus for sparc targets

Paolo Bonzini (2):
  qmp: handle stop/cont in INMIGRATE state
  migration: go to paused state after finishing incoming migration with
    -S

 hmp.c            | 11 +++++------
 migration.c      |  2 +-
 qapi-schema.json | 23 ++++++++++++++---------
 qerror.h         |  3 ---
 qmp.c            | 17 +++++++++++------
 vl.c             |  2 +-
 6 files changed, 32 insertions(+), 26 deletions(-)

-- 
1.7.12.315.g682ce8b

[Qemu-devel] [PULL 1/3] hmp: fix info cpus for sparc targets

[Luiz Capitulino]

From: Aurelien Jarno <aurelien@aurel32.net>

On sparc targets, info cpus returns this kind of output:

| info cpus
| * CPU #0: pc=0x0000000000424d18pc=0x0000000000424d18npc=0x0000000000424d1c thread_id=19460

pc is printed twice, there is no space between pc, pc and npc.

With this patch, pc is not printed anymore when has_npc is set. In addition
the space is printed before pc/nip/npc/PC instead of after the colon so that
multiple prints are possible. This result on the following kind of input on
sparc targets:

| info cpus
| * CPU #0: pc=0x0000000000424d18 npc=0x0000000000424d1c thread_id=19460

Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 hmp.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/hmp.c b/hmp.c
index 2b97982..9df84e3 100644
--- a/hmp.c
+++ b/hmp.c
@@ -245,20 +245,19 @@ void hmp_info_cpus(Monitor *mon)
             active = '*';
         }
 
-        monitor_printf(mon, "%c CPU #%" PRId64 ": ", active, cpu->value->CPU);
+        monitor_printf(mon, "%c CPU #%" PRId64 ":", active, cpu->value->CPU);
 
         if (cpu->value->has_pc) {
-            monitor_printf(mon, "pc=0x%016" PRIx64, cpu->value->pc);
+            monitor_printf(mon, " pc=0x%016" PRIx64, cpu->value->pc);
         }
         if (cpu->value->has_nip) {
-            monitor_printf(mon, "nip=0x%016" PRIx64, cpu->value->nip);
+            monitor_printf(mon, " nip=0x%016" PRIx64, cpu->value->nip);
         }
         if (cpu->value->has_npc) {
-            monitor_printf(mon, "pc=0x%016" PRIx64, cpu->value->pc);
-            monitor_printf(mon, "npc=0x%016" PRIx64, cpu->value->npc);
+            monitor_printf(mon, " npc=0x%016" PRIx64, cpu->value->npc);
         }
         if (cpu->value->has_PC) {
-            monitor_printf(mon, "PC=0x%016" PRIx64, cpu->value->PC);
+            monitor_printf(mon, " PC=0x%016" PRIx64, cpu->value->PC);
         }
 
         if (cpu->value->halted) {
-- 
1.7.12.315.g682ce8b

[Qemu-devel] [PULL 2/3] qmp: handle stop/cont in INMIGRATE state

[Luiz Capitulino]

From: Paolo Bonzini <pbonzini@redhat.com>

Right now, stop followed by an incoming migration will let the
virtual machine start.  cont before an incoming migration instead
will fail.

This is bad because the actual behavior is not predictable; it is
racy with respect to the start of the incoming migration.  That's
because incoming migration is blocking, and thus will delay the
processing of stop/cont until the end of the migration.

In addition, there's nothing that really prevents the user from
typing the block device's passwords before incoming migration is
done, so returning the DeviceEncrypted error is also helpful in
the QMP case.

Both things can be fixed by just toggling the autostart variable when
stop/cont are called in INMIGRATE state.

Note that libvirt is currently working around the race by looping
if the MigrationExpected answer is returned.  After this patch, the
command will return right away without ever raising an error.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qapi-schema.json | 23 ++++++++++++++---------
 qerror.h         |  3 ---
 qmp.c            | 17 +++++++++++------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index c615ee2..6b14edc 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -22,15 +22,11 @@
 # @KVMMissingCap: the requested operation can't be fulfilled because a
 #                 required KVM capability is missing
 #
-# @MigrationExpected: the requested operation can't be fulfilled because a
-#                     migration process is expected
-#
 # Since: 1.2
 ##
 { 'enum': 'ErrorClass',
   'data': [ 'GenericError', 'CommandNotFound', 'DeviceEncrypted',
-            'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap',
-            'MigrationExpected' ] }
+            'DeviceNotActive', 'DeviceNotFound', 'KVMMissingCap' ] }
 
 ##
 # @add_client
@@ -149,7 +145,11 @@
 #
 # @finish-migrate: guest is paused to finish the migration process
 #
-# @inmigrate: guest is paused waiting for an incoming migration
+# @inmigrate: guest is paused waiting for an incoming migration.  Note
+# that this state does not tell whether the machine will start at the
+# end of the migration.  This depends on the command-line -S option and
+# any invocation of 'stop' or 'cont' that has happened since QEMU was
+# started.
 #
 # @internal-error: An internal error that prevents further guest execution
 # has occurred
@@ -1210,7 +1210,9 @@
 # Since:  0.14.0
 #
 # Notes:  This function will succeed even if the guest is already in the stopped
-#         state
+#         state.  In "inmigrate" state, it will ensure that the guest
+#         remains paused once migration finishes, as if the -S option was
+#         passed on the command line.
 ##
 { 'command': 'stop' }
 
@@ -1299,11 +1301,14 @@
 # Since:  0.14.0
 #
 # Returns:  If successful, nothing
-#           If the QEMU is waiting for an incoming migration, MigrationExpected
 #           If QEMU was started with an encrypted block device and a key has
 #              not yet been set, DeviceEncrypted.
 #
-# Notes:  This command will succeed if the guest is currently running.
+# Notes:  This command will succeed if the guest is currently running.  It
+#         will also succeed if the guest is in the "inmigrate" state; in
+#         this case, the effect of the command is to make sure the guest
+#         starts once migration finishes, removing the effect of the -S
+#         command line option if it was passed.
 ##
 { 'command': 'cont' }
 
diff --git a/qerror.h b/qerror.h
index c91708c..5e98a39 100644
--- a/qerror.h
+++ b/qerror.h
@@ -165,9 +165,6 @@ void assert_no_error(Error *err);
 #define QERR_MIGRATION_NOT_SUPPORTED \
     ERROR_CLASS_GENERIC_ERROR, "State blocked by non-migratable device '%s'"
 
-#define QERR_MIGRATION_EXPECTED \
-    ERROR_CLASS_MIGRATION_EXPECTED, "An incoming migration is expected before this command can be executed"
-
 #define QERR_MISSING_PARAMETER \
     ERROR_CLASS_GENERIC_ERROR, "Parameter '%s' is missing"
 
diff --git a/qmp.c b/qmp.c
index 36c54c5..2c8d559 100644
--- a/qmp.c
+++ b/qmp.c
@@ -85,7 +85,11 @@ void qmp_quit(Error **err)
 
 void qmp_stop(Error **errp)
 {
-    vm_stop(RUN_STATE_PAUSED);
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        autostart = 0;
+    } else {
+        vm_stop(RUN_STATE_PAUSED);
+    }
 }
 
 void qmp_system_reset(Error **errp)
@@ -144,10 +148,7 @@ void qmp_cont(Error **errp)
 {
     Error *local_err = NULL;
 
-    if (runstate_check(RUN_STATE_INMIGRATE)) {
-        error_set(errp, QERR_MIGRATION_EXPECTED);
-        return;
-    } else if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
+    if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
                runstate_check(RUN_STATE_SHUTDOWN)) {
         error_set(errp, QERR_RESET_REQUIRED);
         return;
@@ -162,7 +163,11 @@ void qmp_cont(Error **errp)
         return;
     }
 
-    vm_start();
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        autostart = 1;
+    } else {
+        vm_start();
+    }
 }
 
 void qmp_system_wakeup(Error **errp)
-- 
1.7.12.315.g682ce8b

[Qemu-devel] [PULL 3/3] migration: go to paused state after finishing incoming migration with -S

[Luiz Capitulino]

From: Paolo Bonzini <pbonzini@redhat.com>

At the end of migration the machine has started already, and cannot be
destroyed without losing the guest's data.  Hence, prelaunch is the
wrong state.  Go to the paused state instead.  QEMU would reach that
state anyway (after running the guest for the blink of an eye) if the
"stop" command had been received after the start of migration.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c | 2 +-
 vl.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration.c b/migration.c
index 62e0304..e9a5822 100644
--- a/migration.c
+++ b/migration.c
@@ -102,7 +102,7 @@ void process_incoming_migration(QEMUFile *f)
     if (autostart) {
         vm_start();
     } else {
-        runstate_set(RUN_STATE_PRELAUNCH);
+        runstate_set(RUN_STATE_PAUSED);
     }
 }
 
diff --git a/vl.c b/vl.c
index ee3c43a..188af45 100644
--- a/vl.c
+++ b/vl.c
@@ -341,7 +341,7 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_DEBUG, RUN_STATE_RUNNING },
 
     { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING },
-    { RUN_STATE_INMIGRATE, RUN_STATE_PRELAUNCH },
+    { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED },
 
     { RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },
     { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
-- 
1.7.12.315.g682ce8b

Re: [Qemu-devel] [PULL 0/3] QMP queue

[Aurelien Jarno]

On Wed, Oct 24, 2012 at 11:34:37AM -0200, Luiz Capitulino wrote:
> The changes (since a8170e5e97ad17ca169c64ba87ae2f53850dab4c) are available
> in the following repository:
> 
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> 
> Aurelien Jarno (1):
>   hmp: fix info cpus for sparc targets
> 
> Paolo Bonzini (2):
>   qmp: handle stop/cont in INMIGRATE state
>   migration: go to paused state after finishing incoming migration with
>     -S
> 
>  hmp.c            | 11 +++++------
>  migration.c      |  2 +-
>  qapi-schema.json | 23 ++++++++++++++---------
>  qerror.h         |  3 ---
>  qmp.c            | 17 +++++++++++------
>  vl.c             |  2 +-
>  6 files changed, 32 insertions(+), 26 deletions(-)
> 

Thanks, pulled.


-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

Three little birds.

The following changes since commit 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9:

  Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-08-18 12:55:02 +0100)

are available in the git repository at:


  git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

for you to fetch changes up to b3dd1b8c295636e64ceb14cdc4db6420d7319e38:

  monitor: fix use after free (2014-08-18 14:39:10 -0400)

----------------------------------------------------------------
Chen Gang (1):
      dump.c: Fix memory leak issue in cleanup processing for dump_init()

Hani Benhabiles (1):
      monitor: Remove hardcoded watchdog event names

Michael S. Tsirkin (1):
      monitor: fix use after free

 dump.c                    | 18 +++++-------------
 include/monitor/monitor.h |  2 +-
 monitor.c                 | 19 ++++++++++---------
 stubs/fdset-remove-fd.c   |  3 +--
 4 files changed, 17 insertions(+), 25 deletions(-)

Re: [Qemu-devel] [PULL 0/3] QMP queue

[Peter Maydell]

On 18 August 2014 20:26, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> Three little birds.
>
> The following changes since commit 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9:
>
>   Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging (2014-08-18 12:55:02 +0100)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to b3dd1b8c295636e64ceb14cdc4db6420d7319e38:
>
>   monitor: fix use after free (2014-08-18 14:39:10 -0400)
>
> ----------------------------------------------------------------
> Chen Gang (1):
>       dump.c: Fix memory leak issue in cleanup processing for dump_init()
>
> Hani Benhabiles (1):
>       monitor: Remove hardcoded watchdog event names
>
> Michael S. Tsirkin (1):
>       monitor: fix use after free
>
>  dump.c                    | 18 +++++-------------
>  include/monitor/monitor.h |  2 +-
>  monitor.c                 | 19 ++++++++++---------
>  stubs/fdset-remove-fd.c   |  3 +--
>  4 files changed, 17 insertions(+), 25 deletions(-)
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

The following changes since commit c5fa6c86d0765f837515d1c10654c621724a77e0:

  Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-19 14:10:01 +0100)

are available in the git repository at:


  git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

for you to fetch changes up to fc13d937269c1cd01a4b7720c1dcce01722727a2:

  qapi: zero-initialize all QMP command parameters (2014-05-21 09:25:31 -0400)

----------------------------------------------------------------
Luiz Capitulino (1):
      scripts/qapi.py: Avoid syntax not supported by Python 2.4

Michael Roth (1):
      qapi: zero-initialize all QMP command parameters

Peter Feiner (1):
      doc: add "setup" to list of migration states

 qapi-schema.json         | 2 +-
 qmp-commands.hx          | 2 +-
 scripts/qapi-commands.py | 2 +-
 scripts/qapi.py          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Re: [Qemu-devel] [PULL 0/3] QMP queue

[Peter Maydell]

On 22 May 2014 14:53, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit c5fa6c86d0765f837515d1c10654c621724a77e0:
>
>   Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-05-19 14:10:01 +0100)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to fc13d937269c1cd01a4b7720c1dcce01722727a2:
>
>   qapi: zero-initialize all QMP command parameters (2014-05-21 09:25:31 -0400)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

The changes (since 7387de16d0e4d2988df350926537cd12a8e34206) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Luiz Capitulino (2):
  MAINTAINERS: new maintainers for qapi-schema.json
  MAINTAINERS: split Monitor (QMP/HMP) entry

Marcelo Tosatti (1):
  correct RTC_CHANGE_EVENT description

 MAINTAINERS        | 26 ++++++++++++++++++++++++--
 QMP/qmp-events.txt |  3 ++-
 2 files changed, 26 insertions(+), 3 deletions(-)

-- 
1.8.1.4

Re: [Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

On Fri,  7 Jun 2013 15:54:12 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> The changes (since 7387de16d0e4d2988df350926537cd12a8e34206) are available
> in the following repository:
> 
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> 
> Luiz Capitulino (2):
>   MAINTAINERS: new maintainers for qapi-schema.json
>   MAINTAINERS: split Monitor (QMP/HMP) entry
> 
> Marcelo Tosatti (1):
>   correct RTC_CHANGE_EVENT description

Anthony, I've replaced Marcelo's patch. Hope this won't disturb
your work flow.

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

One qapi fix and two fixes that affect the dump-guest-memory QMP command.

The changes (since 87d23f78aa79b72da022afda358bbc8a8509ca70) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Luiz Capitulino (1):
  target-i386: fix abort on bad PML4E/PDPTE/PDE/PTE addresses

Michael Roth (1):
  qapi: pad GenericList value fields to 64 bits

Qiao Nuohan (1):
  target-i386: Fix mask of pte index in memory mapping

 include/qapi/visitor.h            |  5 ++++-
 scripts/qapi-types.py             | 10 ++++++++--
 target-i386/arch_memory_mapping.c | 12 +++++++-----
 tests/test-qmp-output-visitor.c   |  5 ++++-
 4 files changed, 23 insertions(+), 9 deletions(-)

-- 
1.8.1.4

Re: [Qemu-devel] [PULL 0/3] QMP queue

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori

[Qemu-devel] [PULL 0/3] QMP queue

[Luiz Capitulino]

The changes (since 93b48c201eb6c0404d15550a0eaa3c0f7937e35e) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Eric Blake (1):
  qapi: use valid JSON in schema

Michal Novotny (2):
  New cpu-max field in query-machines QMP command output
  Revert "New QMP command query-cpu-max and HMP command cpu_max"

 hmp-commands.hx  |  2 --
 hmp.c            |  8 --------
 hmp.h            |  1 -
 monitor.c        |  7 -------
 qapi-schema.json | 18 +++++-------------
 qmp-commands.hx  | 22 ----------------------
 vl.c             |  6 +-----
 7 files changed, 6 insertions(+), 58 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PULL 0/3]: QMP queue

[Luiz Capitulino]

Three little patches. Two fixes from me and a qapi conversion form Corey.

The changes (since c0958559b1a589a0d189c45ea1adaa6b345f4256) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Corey Bryant (1):
      qapi: Convert getfd and closefd

Luiz Capitulino (2):
      qmp: dump-guest-memory: improve schema doc
      qapi: input_type_enum(): fix error message

 hmp-commands.hx        |  6 ++---
 hmp.c                  | 18 ++++++++++++++
 hmp.h                  |  2 ++
 monitor.c              | 32 +++++++++++-------------
 qapi-schema.json       | 67 +++++++++++++++++++++++++++++++++++++++-----------
 qapi/qapi-visit-core.c |  2 +-
 qmp-commands.hx        | 14 ++++++++---
 7 files changed, 99 insertions(+), 42 deletions(-)

[Qemu-devel] [PULL 0/3]: QMP queue

[Luiz Capitulino]

A few small fixes from Alon.

The changes (since dac6b1b22cbad29ca34735a1e56c9feb9586e3c0) are available
in the following repository:

    git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Alon Levy (3):
      qjson.h: include compiler.h for GCC_FMT_ATTR
      qapi-schema: fix typos and explain 'spice' auth
      qapi-schema.json: fix comment for type ObjectPropretyInfo

 qapi-schema.json |   16 +++++++++-------
 qjson.h          |    1 +
 2 files changed, 10 insertions(+), 7 deletions(-)

Re: [Qemu-devel] [PULL 0/3]: QMP queue

[Anthony Liguori]

On 03/09/2012 02:55 PM, Luiz Capitulino wrote:
> A few small fixes from Alon.
>
> The changes (since dac6b1b22cbad29ca34735a1e56c9feb9586e3c0) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> Alon Levy (3):
>        qjson.h: include compiler.h for GCC_FMT_ATTR
>        qapi-schema: fix typos and explain 'spice' auth
>        qapi-schema.json: fix comment for type ObjectPropretyInfo

Pulled.  Thanks.

Regards,

Anthony Liguori


>
>   qapi-schema.json |   16 +++++++++-------
>   qjson.h          |    1 +
>   2 files changed, 10 insertions(+), 7 deletions(-)
>
>
>