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

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

[Luiz Capitulino]

Most of the patches are runstate fixes and have been sent to the list
already.

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

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

Luiz Capitulino (5):
      QMP: Fix blockdev-snapshot-sync doc example
      runstate: Print state transition when invalid
      runstate: Allow to transition from paused to postmigrate
      savevm: qemu_savevm_state(): Drop stop VM logic
      runstate: Allow user to migrate twice

 cpus.c          |   11 +++++++++++
 migration.c     |    2 +-
 qmp-commands.hx |    8 ++++----
 savevm.c        |    7 -------
 sysemu.h        |    1 +
 vl.c            |   12 ++++++++++--
 6 files changed, 27 insertions(+), 14 deletions(-)

[Qemu-devel] [PATCH 1/5] QMP: Fix blockdev-snapshot-sync doc example

[Luiz Capitulino]

Fix wrong command name.

Reported-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 qmp-commands.hx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qmp-commands.hx b/qmp-commands.hx
index ea96191..9edb3b9 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -710,10 +710,10 @@ Arguments:
 
 Example:
 
--> { "execute": "blockdev-snapshot", "arguments": { "device": "ide-hd0",
-                                                    "snapshot-file":
-                                                    "/some/place/my-image",
-                                                    "format": "qcow2" } }
+-> { "execute": "blockdev-snapshot-sync", "arguments": { "device": "ide-hd0",
+                                                         "snapshot-file":
+                                                        "/some/place/my-image",
+                                                        "format": "qcow2" } }
 <- { "return": {} }
 
 EQMP
-- 
1.7.7.rc3

[Qemu-devel] [PATCH 2/5] runstate: Print state transition when invalid

[Luiz Capitulino]

Makes it easier to debug.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 vl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index dbf7778..6645720 100644
--- a/vl.c
+++ b/vl.c
@@ -397,7 +397,9 @@ void runstate_set(RunState new_state)
 {
     if (new_state >= RUN_STATE_MAX ||
         !runstate_valid_transitions[current_run_state][new_state]) {
-        fprintf(stderr, "invalid runstate transition\n");
+        fprintf(stderr, "ERROR: invalid runstate transition: '%s' -> '%s'\n",
+                RunState_lookup[current_run_state],
+                RunState_lookup[new_state]);
         abort();
     }
 
-- 
1.7.7.rc3

[Qemu-devel] [PATCH 3/5] runstate: Allow to transition from paused to postmigrate

[Luiz Capitulino]

The user may already have paused the VM before starting the
migration process. If s/he does that, then the state will be
'paused' when we finish the migration process. In that case
we want to transition from 'paused' to 'postmigrate' as the
latter is now the real reason why the VM is stopped.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 vl.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/vl.c b/vl.c
index 6645720..2e991fc 100644
--- a/vl.c
+++ b/vl.c
@@ -343,6 +343,7 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_IO_ERROR, RUN_STATE_RUNNING },
 
     { RUN_STATE_PAUSED, RUN_STATE_RUNNING },
+    { RUN_STATE_PAUSED, RUN_STATE_POSTMIGRATE },
 
     { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },
 
-- 
1.7.7.rc3

[Qemu-devel] [PATCH 4/5] savevm: qemu_savevm_state(): Drop stop VM logic

[Luiz Capitulino]

qemu_savevm_state() has some logic to stop the VM and to (or not to)
resume it. But this seems to be a big noop, as qemu_savevm_state()
is only called by do_savevm() when the VM is already stopped.

So, let's drop qemu_savevm_state()'s stop VM logic.

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 savevm.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/savevm.c b/savevm.c
index bf4d0e7..abb4a60 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1599,12 +1599,8 @@ void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f)
 
 static int qemu_savevm_state(Monitor *mon, QEMUFile *f)
 {
-    int saved_vm_running;
     int ret;
 
-    saved_vm_running = runstate_is_running();
-    vm_stop(RUN_STATE_SAVE_VM);
-
     if (qemu_savevm_state_blocked(mon)) {
         ret = -EINVAL;
         goto out;
@@ -1626,9 +1622,6 @@ out:
     if (qemu_file_has_error(f))
         ret = -EIO;
 
-    if (!ret && saved_vm_running)
-        vm_start();
-
     return ret;
 }
 
-- 
1.7.7.rc3

[Qemu-devel] [PATCH 5/5] runstate: Allow user to migrate twice

[Luiz Capitulino]

It should be a matter of allowing the transition POSTMIGRATE ->
FINISH_MIGRATE, but it turns out that the VM won't do the
transition the second time because it's already stopped.

So this commit also adds vm_stop_force_state() which performs
the transition even if the VM is already stopped.

While there also allow other states to migrate.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 cpus.c      |   11 +++++++++++
 migration.c |    2 +-
 sysemu.h    |    1 +
 vl.c        |    9 +++++++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cpus.c b/cpus.c
index 8978779..5f5b763 100644
--- a/cpus.c
+++ b/cpus.c
@@ -887,6 +887,17 @@ void vm_stop(RunState state)
     do_vm_stop(state);
 }
 
+/* does a state transition even if the VM is already stopped,
+   current state is forgotten forever */
+void vm_stop_force_state(RunState state)
+{
+    if (runstate_is_running()) {
+        vm_stop(state);
+    } else {
+        runstate_set(state);
+    }
+}
+
 static int tcg_cpu_exec(CPUState *env)
 {
     int ret;
diff --git a/migration.c b/migration.c
index 77a51ad..62b74a6 100644
--- a/migration.c
+++ b/migration.c
@@ -375,7 +375,7 @@ void migrate_fd_put_ready(void *opaque)
         int old_vm_running = runstate_is_running();
 
         DPRINTF("done iterating\n");
-        vm_stop(RUN_STATE_FINISH_MIGRATE);
+        vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
 
         if ((qemu_savevm_state_complete(s->mon, s->file)) < 0) {
             if (old_vm_running) {
diff --git a/sysemu.h b/sysemu.h
index a889d90..7d288f8 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -35,6 +35,7 @@ void vm_state_notify(int running, RunState state);
 
 void vm_start(void);
 void vm_stop(RunState state);
+void vm_stop_force_state(RunState state);
 
 void qemu_system_reset_request(void);
 void qemu_system_shutdown_request(void);
diff --git a/vl.c b/vl.c
index 2e991fc..103a0df 100644
--- a/vl.c
+++ b/vl.c
@@ -339,17 +339,20 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_INMIGRATE, RUN_STATE_PRELAUNCH },
 
     { RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },
+    { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_IO_ERROR, RUN_STATE_RUNNING },
+    { RUN_STATE_IO_ERROR, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_PAUSED, RUN_STATE_RUNNING },
-    { RUN_STATE_PAUSED, RUN_STATE_POSTMIGRATE },
+    { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },
+    { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
+    { RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
     { RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
-    { RUN_STATE_PRELAUNCH, RUN_STATE_POSTMIGRATE },
 
     { RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
     { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },
@@ -369,8 +372,10 @@ static const RunStateTransition runstate_transitions_def[] = {
     { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
 
     { RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED },
+    { RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
+    { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
 
     { RUN_STATE_MAX, RUN_STATE_MAX },
 };
-- 
1.7.7.rc3

Re: [Qemu-devel] [PATCH 5/5] runstate: Allow user to migrate twice

[Paolo Bonzini]

On 10/14/2011 07:26 PM, Luiz Capitulino wrote:
> It should be a matter of allowing the transition POSTMIGRATE ->
> FINISH_MIGRATE, but it turns out that the VM won't do the
> transition the second time because it's already stopped.
>
> So this commit also adds vm_stop_force_state() which performs
> the transition even if the VM is already stopped.
>
> While there also allow other states to migrate.
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
> ---
>   cpus.c      |   11 +++++++++++
>   migration.c |    2 +-
>   sysemu.h    |    1 +
>   vl.c        |    9 +++++++--
>   4 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 8978779..5f5b763 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -887,6 +887,17 @@ void vm_stop(RunState state)
>       do_vm_stop(state);
>   }
>
> +/* does a state transition even if the VM is already stopped,
> +   current state is forgotten forever */
> +void vm_stop_force_state(RunState state)
> +{
> +    if (runstate_is_running()) {
> +        vm_stop(state);
> +    } else {
> +        runstate_set(state);
> +    }
> +}
> +
>   static int tcg_cpu_exec(CPUState *env)
>   {
>       int ret;
> diff --git a/migration.c b/migration.c
> index 77a51ad..62b74a6 100644
> --- a/migration.c
> +++ b/migration.c
> @@ -375,7 +375,7 @@ void migrate_fd_put_ready(void *opaque)
>           int old_vm_running = runstate_is_running();
>
>           DPRINTF("done iterating\n");
> -        vm_stop(RUN_STATE_FINISH_MIGRATE);
> +        vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
>
>           if ((qemu_savevm_state_complete(s->mon, s->file))<  0) {
>               if (old_vm_running) {
> diff --git a/sysemu.h b/sysemu.h
> index a889d90..7d288f8 100644
> --- a/sysemu.h
> +++ b/sysemu.h
> @@ -35,6 +35,7 @@ void vm_state_notify(int running, RunState state);
>
>   void vm_start(void);
>   void vm_stop(RunState state);
> +void vm_stop_force_state(RunState state);
>
>   void qemu_system_reset_request(void);
>   void qemu_system_shutdown_request(void);
> diff --git a/vl.c b/vl.c
> index 2e991fc..103a0df 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -339,17 +339,20 @@ static const RunStateTransition runstate_transitions_def[] = {
>       { RUN_STATE_INMIGRATE, RUN_STATE_PRELAUNCH },
>
>       { RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },
> +    { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_IO_ERROR, RUN_STATE_RUNNING },
> +    { RUN_STATE_IO_ERROR, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_PAUSED, RUN_STATE_RUNNING },
> -    { RUN_STATE_PAUSED, RUN_STATE_POSTMIGRATE },
> +    { RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_POSTMIGRATE, RUN_STATE_RUNNING },
> +    { RUN_STATE_POSTMIGRATE, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
> +    { RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
>       { RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
> -    { RUN_STATE_PRELAUNCH, RUN_STATE_POSTMIGRATE },
>
>       { RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
>       { RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },
> @@ -369,8 +372,10 @@ static const RunStateTransition runstate_transitions_def[] = {
>       { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
>
>       { RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED },
> +    { RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING },
> +    { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE },
>
>       { RUN_STATE_MAX, RUN_STATE_MAX },
>   };

Belatedly-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

Re: [Qemu-devel] [PATCH 2/5] runstate: Print state transition when invalid

[Wen Congyang]

At 10/15/2011 01:26 AM, Luiz Capitulino Write:
> Makes it easier to debug.
> 
> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> ---
>  vl.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/vl.c b/vl.c
> index dbf7778..6645720 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -397,7 +397,9 @@ void runstate_set(RunState new_state)
>  {
>      if (new_state >= RUN_STATE_MAX ||
>          !runstate_valid_transitions[current_run_state][new_state]) {
> -        fprintf(stderr, "invalid runstate transition\n");
> +        fprintf(stderr, "ERROR: invalid runstate transition: '%s' -> '%s'\n",
> +                RunState_lookup[current_run_state],
> +                RunState_lookup[new_state]);

If new_state >= RUN_STATE_MAX, we can not use RunState_lookup.
I think it's better to use:
    new_state >= RUN_STATE_MAX ? "invalid state" : RunState_lookup[new_state]

Thanks
Wen Congyang

>          abort();
>      }
>  

Re: [Qemu-devel] [PATCH 2/5] runstate: Print state transition when invalid

[Luiz Capitulino]

On Wed, 19 Oct 2011 08:43:33 +0800
Wen Congyang <wency@cn.fujitsu.com> wrote:

> At 10/15/2011 01:26 AM, Luiz Capitulino Write:
> > Makes it easier to debug.
> > 
> > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> > ---
> >  vl.c |    4 +++-
> >  1 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/vl.c b/vl.c
> > index dbf7778..6645720 100644
> > --- a/vl.c
> > +++ b/vl.c
> > @@ -397,7 +397,9 @@ void runstate_set(RunState new_state)
> >  {
> >      if (new_state >= RUN_STATE_MAX ||
> >          !runstate_valid_transitions[current_run_state][new_state]) {
> > -        fprintf(stderr, "invalid runstate transition\n");
> > +        fprintf(stderr, "ERROR: invalid runstate transition: '%s' -> '%s'\n",
> > +                RunState_lookup[current_run_state],
> > +                RunState_lookup[new_state]);
> 
> If new_state >= RUN_STATE_MAX, we can not use RunState_lookup.

Good catch!

> I think it's better to use:
>     new_state >= RUN_STATE_MAX ? "invalid state" : RunState_lookup[new_state]

I prefer to do the following instead:

diff --git a/vl.c b/vl.c
index 2dce3ae..2a634a7 100644
--- a/vl.c
+++ b/vl.c
@@ -393,9 +393,12 @@ void runstate_init(void)
 /* This function will abort() on invalid state transitions */
 void runstate_set(RunState new_state)
 {
-    if (new_state >= RUN_STATE_MAX ||
-        !runstate_valid_transitions[current_run_state][new_state]) {
-        fprintf(stderr, "invalid runstate transition\n");
+    assert(new_state < RUN_STATE_MAX);
+
+    if (!runstate_valid_transitions[current_run_state][new_state]) {
+        fprintf(stderr, "ERROR: invalid runstate transition: '%s' -> '%s'\n",
+                RunState_lookup[current_run_state],
+                RunState_lookup[new_state]);
         abort();
     }
 
-- 
1.7.7.rc3


> 
> Thanks
> Wen Congyang
> 
> >          abort();
> >      }
> >  
> 

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

[Anthony Liguori]

On 10/14/2011 12:26 PM, Luiz Capitulino wrote:
> Most of the patches are runstate fixes and have been sent to the list
> already.
>
> The changes (since 210b3a70383b0bcc4266856431491b39dcb4f14d) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git qmp/queue

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Luiz Capitulino (5):
>        QMP: Fix blockdev-snapshot-sync doc example
>        runstate: Print state transition when invalid
>        runstate: Allow to transition from paused to postmigrate
>        savevm: qemu_savevm_state(): Drop stop VM logic
>        runstate: Allow user to migrate twice
>
>   cpus.c          |   11 +++++++++++
>   migration.c     |    2 +-
>   qmp-commands.hx |    8 ++++----
>   savevm.c        |    7 -------
>   sysemu.h        |    1 +
>   vl.c            |   12 ++++++++++--
>   6 files changed, 27 insertions(+), 14 deletions(-)
>
>
>

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

[Luiz Capitulino]

Contains only the DEVICE_TRAY_MOVED event series.

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

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

Luiz Capitulino (5):
      block: Rename bdrv_mon_event() & BlockMonEventAction
      block: bdrv_eject(): Make eject_flag a real bool
      block: Don't call bdrv_eject() if the tray state didn't change
      ide: drop ide_tray_state_post_load()
      qmp: add DEVICE_TRAY_MOVED event

 QMP/qmp-events.txt |   18 +++++++++++
 block.c            |   84 +++++++++++++++++++++++++++++++++------------------
 block.h            |    8 ++--
 block/raw-posix.c  |    6 ++--
 block/raw.c        |    2 +-
 block_int.h        |    2 +-
 hw/ide/atapi.c     |    7 +++-
 hw/ide/core.c      |   16 ++--------
 hw/scsi-disk.c     |   13 +++++---
 hw/virtio-blk.c    |    6 ++--
 monitor.c          |    3 ++
 monitor.h          |    1 +
 12 files changed, 104 insertions(+), 62 deletions(-)

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

[Anthony Liguori]

On 02/23/2012 08:42 AM, Luiz Capitulino wrote:
> Contains only the DEVICE_TRAY_MOVED event series.
>
> The changes (since 235fe3bfd46b1104575b540d0bc3fdf584030b99) are available
> in the following repository:
>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Luiz Capitulino (5):
>        block: Rename bdrv_mon_event()&  BlockMonEventAction
>        block: bdrv_eject(): Make eject_flag a real bool
>        block: Don't call bdrv_eject() if the tray state didn't change
>        ide: drop ide_tray_state_post_load()
>        qmp: add DEVICE_TRAY_MOVED event
>
>   QMP/qmp-events.txt |   18 +++++++++++
>   block.c            |   84 +++++++++++++++++++++++++++++++++------------------
>   block.h            |    8 ++--
>   block/raw-posix.c  |    6 ++--
>   block/raw.c        |    2 +-
>   block_int.h        |    2 +-
>   hw/ide/atapi.c     |    7 +++-
>   hw/ide/core.c      |   16 ++--------
>   hw/scsi-disk.c     |   13 +++++---
>   hw/virtio-blk.c    |    6 ++--
>   monitor.c          |    3 ++
>   monitor.h          |    1 +
>   12 files changed, 104 insertions(+), 62 deletions(-)
>
>
>

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

[Luiz Capitulino]

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

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

Wenchao Xia (5):
  HMP: add QDict to info callback handler
  HMP: delete info handler
  HMP: add infrastructure for sub command
  HMP: move define of mon_cmds
  HMP: add sub command table to info

 hmp-commands.hx         |   3 +-
 hmp.c                   |  36 ++++-----
 hmp.h                   |  36 ++++-----
 hw/i8259.c              |   4 +-
 hw/lm32_pic.c           |   4 +-
 hw/lm32_pic.h           |   4 +-
 hw/loader.c             |   2 +-
 hw/loader.h             |   3 +-
 hw/pc.h                 |   4 +-
 hw/pcmcia.h             |   2 +-
 hw/qdev-monitor.c       |   4 +-
 hw/qdev-monitor.h       |   4 +-
 hw/sun4m.c              |   4 +-
 hw/sun4m.h              |   4 +-
 hw/usb.h                |   2 +-
 hw/usb/bus.c            |   2 +-
 hw/usb/host-bsd.c       |   2 +-
 hw/usb/host-linux.c     |   2 +-
 include/net/net.h       |   2 +-
 include/net/slirp.h     |   2 +-
 include/sysemu/sysemu.h |   4 +-
 monitor.c               | 200 +++++++++++++++++++++++++-----------------------
 net/net.c               |   2 +-
 net/slirp.c             |   2 +-
 savevm.c                |   2 +-
 vl.c                    |   2 +-
 26 files changed, 174 insertions(+), 164 deletions(-)

-- 
1.8.1.GIT

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

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori

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

[Luiz Capitulino]

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

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

Igor Mammedov (4):
  object_add: consolidate error handling
  vl.c: -object: don't ignore duplicate 'id'
  add optional 2nd stage initialization to -object/object-add commands
  virtio_rng: replace custom backend API with UserCreatable.complete()
    callback

Stratos Psomadakis (1):
  monitor: Cleanup mon->outbuf on write error

 backends/rng.c                  | 17 +++++++++--
 hw/virtio/virtio-rng.c          | 15 ++++++----
 include/qom/object_interfaces.h | 62 +++++++++++++++++++++++++++++++++++++++++
 include/sysemu/rng.h            | 11 --------
 monitor.c                       |  4 +--
 qmp.c                           | 22 ++++++++++++---
 qom/Makefile.objs               |  1 +
 qom/object_interfaces.c         | 32 +++++++++++++++++++++
 vl.c                            | 22 ++++++++++++++-
 9 files changed, 160 insertions(+), 26 deletions(-)
 create mode 100644 include/qom/object_interfaces.h
 create mode 100644 qom/object_interfaces.c

-- 
1.8.1.4

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

[Peter Maydell]

On 28 January 2014 17:27, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The changes (since 0169c511554cb0014a00290b0d3d26c31a49818f) are available
> in the following repository:
>
>     git://repo.or.cz/qemu/qmp-unstable.git queue/qmp

Applied, thanks.

-- PMM

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

[Luiz Capitulino]

Hi,

This pull request contains two series. A balloon series and memory hotplug
doc series. The balloon series is not totally QMP related, but it has
implications to libvirt when using memory hotplug. So, I'm picking it up.
The second series is a memory hotplug doc improvement. This is not QMP
related at all, but I'm adding it here as it got fully reviewed and is
really wanted.

The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)

are available in the git repository at:


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

for you to fetch changes up to a3b042179859c68b3d08f8aa43866d28d6b56987:

  docs: add memory-hotplug.txt (2015-03-04 13:00:36 -0500)

----------------------------------------------------------------
Luiz Capitulino (2):
      qemu-options.hx: improve -m description
      docs: add memory-hotplug.txt

zhanghailiang (3):
      pc-dimm: add a function to calculate VM's current RAM size
      virtio-balloon: Fix balloon not working correctly when hotplug memory
      virtio-balloon: Add some trace events

 docs/memory-hotplug.txt         | 76 +++++++++++++++++++++++++++++++++++++++++
 hw/mem/pc-dimm.c                | 26 ++++++++++++++
 hw/virtio/virtio-balloon.c      | 21 ++++++++----
 include/exec/cpu-common.h       |  1 +
 qemu-options.hx                 | 22 +++++++++---
 stubs/qmp_pc_dimm_device_list.c |  5 +++
 trace-events                    |  4 +++
 7 files changed, 144 insertions(+), 11 deletions(-)
 create mode 100644 docs/memory-hotplug.txt

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

[Peter Maydell]

On 5 March 2015 at 04:13, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> Hi,
>
> This pull request contains two series. A balloon series and memory hotplug
> doc series. The balloon series is not totally QMP related, but it has
> implications to libvirt when using memory hotplug. So, I'm picking it up.
> The second series is a memory hotplug doc improvement. This is not QMP
> related at all, but I'm adding it here as it got fully reviewed and is
> really wanted.
>
> The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> for you to fetch changes up to a3b042179859c68b3d08f8aa43866d28d6b56987:
>
>   docs: add memory-hotplug.txt (2015-03-04 13:00:36 -0500)

Nudge: this isn't a signed pull request. I'm not currently rejecting
unsigned pulls, but at some point in the not very distant future
(maybe after 2.3?) I plan to start doing so...

That said, I've applied this to master.

thanks
-- PMM


-- PMM

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

[Luiz Capitulino]

On Sun, 8 Mar 2015 23:08:04 +0900
Peter Maydell <peter.maydell@linaro.org> wrote:

> On 5 March 2015 at 04:13, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> > Hi,
> >
> > This pull request contains two series. A balloon series and memory hotplug
> > doc series. The balloon series is not totally QMP related, but it has
> > implications to libvirt when using memory hotplug. So, I'm picking it up.
> > The second series is a memory hotplug doc improvement. This is not QMP
> > related at all, but I'm adding it here as it got fully reviewed and is
> > really wanted.
> >
> > The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:
> >
> >   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)
> >
> > are available in the git repository at:
> >
> >
> >   git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
> >
> > for you to fetch changes up to a3b042179859c68b3d08f8aa43866d28d6b56987:
> >
> >   docs: add memory-hotplug.txt (2015-03-04 13:00:36 -0500)
> 
> Nudge: this isn't a signed pull request. I'm not currently rejecting
> unsigned pulls, but at some point in the not very distant future
> (maybe after 2.3?) I plan to start doing so...

My bad. I knew there was something missing when I was fixing my
scripts after a long time without sending pull requests. Sorry
about that.

> That said, I've applied this to master.

Thanks.