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

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

[Luiz Capitulino]

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

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

Luiz Capitulino (9):
      Move vm_state_notify() prototype from cpus.h to sysemu.h
      Replace the VMSTOP macros with a proper state type
      RunState: Add additional states
      runstate_set(): Check for valid transitions
      Drop the incoming_expected global variable
      Drop the vm_running global variable
      Monitor/QMP: Don't allow cont on bad VM state
      QMP: query-status: Introduce 'status' key
      HMP: info status: Print the VM state

 audio/audio.c      |    2 +-
 cpus.c             |   20 +++---
 cpus.h             |    1 -
 gdbstub.c          |   34 ++++++------
 hw/etraxfs_dma.c   |    2 +-
 hw/ide/ahci.c      |    2 +-
 hw/ide/core.c      |    4 +-
 hw/ide/internal.h  |    3 +-
 hw/ide/pci.c       |    2 +-
 hw/kvmclock.c      |    5 +-
 hw/qxl.c           |    5 +-
 hw/scsi-disk.c     |    4 +-
 hw/virtio-blk.c    |    5 +-
 hw/virtio.c        |    4 +-
 hw/watchdog.c      |    2 +-
 kvm-all.c          |    2 +-
 migration.c        |   14 +++--
 monitor.c          |   22 +++++--
 qemu-timer.c       |    9 ++-
 qerror.c           |    4 +
 qerror.h           |    3 +
 qmp-commands.hx    |   19 ++++++-
 savevm.c           |    8 +-
 sysemu.h           |   42 +++++++++-----
 target-i386/kvm.c  |    4 +-
 ui/sdl.c           |    6 +-
 ui/spice-display.c |    3 +-
 ui/spice-display.h |    4 +-
 vl.c               |  156 ++++++++++++++++++++++++++++++++++++++++++++++------
 xen-all.c          |    8 ++-
 30 files changed, 290 insertions(+), 109 deletions(-)

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

[Luiz Capitulino]

Anthony,

This is my latest pull of the RunState series with a build problem fixed
and yet another rebase (solved automatically by git).

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

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

Luiz Capitulino (9):
      Move vm_state_notify() prototype from cpus.h to sysemu.h
      Replace the VMSTOP macros with a proper state type
      RunState: Add additional states
      runstate_set(): Check for valid transitions
      Drop the incoming_expected global variable
      Drop the vm_running global variable
      Monitor/QMP: Don't allow cont on bad VM state
      QMP: query-status: Introduce 'status' key
      HMP: info status: Print the VM state

 audio/audio.c      |    2 +-
 cpus.c             |   20 +++---
 cpus.h             |    1 -
 gdbstub.c          |   34 ++++++------
 hw/etraxfs_dma.c   |    2 +-
 hw/ide/ahci.c      |    2 +-
 hw/ide/core.c      |    4 +-
 hw/ide/internal.h  |    3 +-
 hw/ide/pci.c       |    2 +-
 hw/kvmclock.c      |    5 +-
 hw/qxl.c           |    5 +-
 hw/scsi-disk.c     |    4 +-
 hw/virtio-blk.c    |    5 +-
 hw/virtio.c        |    4 +-
 hw/watchdog.c      |    2 +-
 kvm-all.c          |    2 +-
 migration.c        |   14 +++--
 monitor.c          |   22 +++++--
 qemu-timer.c       |    9 ++-
 qerror.c           |    4 +
 qerror.h           |    3 +
 qmp-commands.hx    |   19 ++++++-
 savevm.c           |    8 +-
 sysemu.h           |   42 +++++++++-----
 target-i386/kvm.c  |    4 +-
 ui/sdl.c           |    6 +-
 ui/spice-display.c |    3 +-
 ui/spice-display.h |    4 +-
 vl.c               |  156 ++++++++++++++++++++++++++++++++++++++++++++++------
 xen-all.c          |   12 ++--
 30 files changed, 292 insertions(+), 111 deletions(-)

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

[Anthony Liguori]

On 09/15/2011 03:05 PM, Luiz Capitulino wrote:
> Anthony,
>
> This is my latest pull of the RunState series with a build problem fixed
> and yet another rebase (solved automatically by git).
>
> The changes (since ef4f97cba2a354656b00eb8659bf61ab2321fa4e) are available
> in the following repository:

Pulled.  Thanks.

Regards,

Anthony Liguori

>
>      git://repo.or.cz/qemu/qmp-unstable.git queue/qmp
>
> Luiz Capitulino (9):
>        Move vm_state_notify() prototype from cpus.h to sysemu.h
>        Replace the VMSTOP macros with a proper state type
>        RunState: Add additional states
>        runstate_set(): Check for valid transitions
>        Drop the incoming_expected global variable
>        Drop the vm_running global variable
>        Monitor/QMP: Don't allow cont on bad VM state
>        QMP: query-status: Introduce 'status' key
>        HMP: info status: Print the VM state
>
>   audio/audio.c      |    2 +-
>   cpus.c             |   20 +++---
>   cpus.h             |    1 -
>   gdbstub.c          |   34 ++++++------
>   hw/etraxfs_dma.c   |    2 +-
>   hw/ide/ahci.c      |    2 +-
>   hw/ide/core.c      |    4 +-
>   hw/ide/internal.h  |    3 +-
>   hw/ide/pci.c       |    2 +-
>   hw/kvmclock.c      |    5 +-
>   hw/qxl.c           |    5 +-
>   hw/scsi-disk.c     |    4 +-
>   hw/virtio-blk.c    |    5 +-
>   hw/virtio.c        |    4 +-
>   hw/watchdog.c      |    2 +-
>   kvm-all.c          |    2 +-
>   migration.c        |   14 +++--
>   monitor.c          |   22 +++++--
>   qemu-timer.c       |    9 ++-
>   qerror.c           |    4 +
>   qerror.h           |    3 +
>   qmp-commands.hx    |   19 ++++++-
>   savevm.c           |    8 +-
>   sysemu.h           |   42 +++++++++-----
>   target-i386/kvm.c  |    4 +-
>   ui/sdl.c           |    6 +-
>   ui/spice-display.c |    3 +-
>   ui/spice-display.h |    4 +-
>   vl.c               |  156 ++++++++++++++++++++++++++++++++++++++++++++++------
>   xen-all.c          |   12 ++--
>   30 files changed, 292 insertions(+), 111 deletions(-)
>
>
>

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

[Luiz Capitulino]

The following changes since commit 90a2541b763b31d2b551b07e24aae3de5266d31b:

  target-i386: fix over 80 chars warnings (2013-06-15 17:50:38 +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 dbfbc6373441e436ac6e2bcf7a8acb284225aa21:

  qerror: drop QERR_OPEN_FILE_FAILED macro (2013-06-17 11:01:14 -0400)

----------------------------------------------------------------
Luiz Capitulino (9):
      error: add error_setg_file_open() helper
      rng-random: use error_setg_file_open()
      block: mirror_complete(): use error_setg_file_open()
      blockdev: use error_setg_file_open()
      cpus: use error_setg_file_open()
      dump: qmp_dump_guest_memory(): use error_setg_file_open()
      savevm: qmp_xen_save_devices_state(): use error_setg_file_open()
      block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED
      qerror: drop QERR_OPEN_FILE_FAILED macro

 backends/rng-random.c     |  3 +--
 block.c                   |  4 ++--
 block/mirror.c            |  2 +-
 blockdev.c                | 11 +++++++----
 cpus.c                    |  4 ++--
 dump.c                    |  2 +-
 include/qapi/error.h      |  5 +++++
 include/qapi/qmp/qerror.h |  3 ---
 savevm.c                  |  2 +-
 util/error.c              |  5 +++++
 10 files changed, 25 insertions(+), 16 deletions(-)

[Qemu-devel] [PULL 1/9] error: add error_setg_file_open() helper

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qapi/error.h | 5 +++++
 util/error.c         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/include/qapi/error.h b/include/qapi/error.h
index 5cd2f0c..ffd1cea 100644
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -45,6 +45,11 @@ void error_set_errno(Error **err, int os_error, ErrorClass err_class, const char
     error_set_errno(err, os_error, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__)
 
 /**
+ * Helper for open() errors
+ */
+void error_setg_file_open(Error **errp, int os_errno, const char *filename);
+
+/**
  * Returns true if an indirect pointer to an error is pointing to a valid
  * error object.
  */
diff --git a/util/error.c b/util/error.c
index 519f6b6..53b0435 100644
--- a/util/error.c
+++ b/util/error.c
@@ -71,6 +71,11 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
     *errp = err;
 }
 
+void error_setg_file_open(Error **errp, int os_errno, const char *filename)
+{
+    error_setg_errno(errp, os_errno, "Could not open '%s'", filename);
+}
+
 Error *error_copy(const Error *err)
 {
     Error *err_new;
-- 
1.8.1.4

[Qemu-devel] [PULL 2/9] rng-random: use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 backends/rng-random.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backends/rng-random.c b/backends/rng-random.c
index 830360c..68dfc8a 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -78,9 +78,8 @@ static void rng_random_opened(RngBackend *b, Error **errp)
                   "filename", "a valid filename");
     } else {
         s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
-
         if (s->fd == -1) {
-            error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
+            error_setg_file_open(errp, errno, s->filename);
         }
     }
 }
-- 
1.8.1.4

[Qemu-devel] [PULL 3/9] block: mirror_complete(): use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 block/mirror.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/mirror.c b/block/mirror.c
index 8b07dec..1ae724f 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -512,7 +512,7 @@ static void mirror_complete(BlockJob *job, Error **errp)
         char backing_filename[PATH_MAX];
         bdrv_get_full_backing_filename(s->target, backing_filename,
                                        sizeof(backing_filename));
-        error_set(errp, QERR_OPEN_FILE_FAILED, backing_filename);
+        error_setg_file_open(errp, -ret, backing_filename);
         return;
     }
     if (!s->synced) {
-- 
1.8.1.4

[Qemu-devel] [PULL 4/9] blockdev: use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 9937311..5975dde 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -899,7 +899,7 @@ static void external_snapshot_prepare(BlkTransactionStates *common,
     ret = bdrv_open(states->new_bs, new_image_file, NULL,
                     flags | BDRV_O_NO_BACKING, drv);
     if (ret != 0) {
-        error_set(errp, QERR_OPEN_FILE_FAILED, new_image_file);
+        error_setg_file_open(errp, -ret, new_image_file);
     }
 }
 
@@ -1062,8 +1062,11 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename,
                                     int bdrv_flags, BlockDriver *drv,
                                     const char *password, Error **errp)
 {
-    if (bdrv_open(bs, filename, NULL, bdrv_flags, drv) < 0) {
-        error_set(errp, QERR_OPEN_FILE_FAILED, filename);
+    int ret;
+
+    ret = bdrv_open(bs, filename, NULL, bdrv_flags, drv);
+    if (ret < 0) {
+        error_setg_file_open(errp, -ret, filename);
         return;
     }
 
@@ -1483,7 +1486,7 @@ void qmp_drive_mirror(const char *device, const char *target,
 
     if (ret < 0) {
         bdrv_delete(target_bs);
-        error_set(errp, QERR_OPEN_FILE_FAILED, target);
+        error_setg_file_open(errp, -ret, target);
         return;
     }
 
-- 
1.8.1.4

[Qemu-devel] [PULL 5/9] cpus: use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 cpus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cpus.c b/cpus.c
index c232265..c8bc8ad 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1278,7 +1278,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char *filename,
 
     f = fopen(filename, "wb");
     if (!f) {
-        error_set(errp, QERR_OPEN_FILE_FAILED, filename);
+        error_setg_file_open(errp, errno, filename);
         return;
     }
 
@@ -1308,7 +1308,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename,
 
     f = fopen(filename, "wb");
     if (!f) {
-        error_set(errp, QERR_OPEN_FILE_FAILED, filename);
+        error_setg_file_open(errp, errno, filename);
         return;
     }
 
-- 
1.8.1.4

[Qemu-devel] [PULL 6/9] dump: qmp_dump_guest_memory(): use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 dump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dump.c b/dump.c
index 44a1339..c812cfa 100644
--- a/dump.c
+++ b/dump.c
@@ -853,7 +853,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin,
     if  (strstart(file, "file:", &p)) {
         fd = qemu_open(p, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR);
         if (fd < 0) {
-            error_set(errp, QERR_OPEN_FILE_FAILED, p);
+            error_setg_file_open(errp, errno, p);
             return;
         }
     }
-- 
1.8.1.4

[Qemu-devel] [PULL 7/9] savevm: qmp_xen_save_devices_state(): use error_setg_file_open()

[Luiz Capitulino]

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 savevm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/savevm.c b/savevm.c
index 2ce439f..ff5ece6 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2410,7 +2410,7 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp)
 
     f = qemu_fopen(filename, "wb");
     if (!f) {
-        error_set(errp, QERR_OPEN_FILE_FAILED, filename);
+        error_setg_file_open(errp, errno, filename);
         goto the_end;
     }
     ret = qemu_save_device_state(f);
-- 
1.8.1.4

[Qemu-devel] [PULL 8/9] block: bdrv_reopen_prepare(): don't use QERR_OPEN_FILE_FAILED

[Luiz Capitulino]

The call to drv->bdrv_reopen_prepare() can fail due to reasons
other than an open failure. Unfortunately, we can't use errno
nor -ret, cause they are not always set.

Stick to a generic error message then.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/block.c b/block.c
index 79ad33d..b88ad2f 100644
--- a/block.c
+++ b/block.c
@@ -1291,8 +1291,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
             if (local_err != NULL) {
                 error_propagate(errp, local_err);
             } else {
-                error_set(errp, QERR_OPEN_FILE_FAILED,
-                          reopen_state->bs->filename);
+                error_setg(errp, "failed while preparing to reopen image '%s'",
+                           reopen_state->bs->filename);
             }
             goto error;
         }
-- 
1.8.1.4

[Qemu-devel] [PULL 9/9] qerror: drop QERR_OPEN_FILE_FAILED macro

[Luiz Capitulino]

Not used since the last commit.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
---
 include/qapi/qmp/qerror.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 6c0a18d..c30c2f6 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -177,9 +177,6 @@ void assert_no_error(Error *err);
 #define QERR_NOT_SUPPORTED \
     ERROR_CLASS_GENERIC_ERROR, "Not supported"
 
-#define QERR_OPEN_FILE_FAILED \
-    ERROR_CLASS_GENERIC_ERROR, "Could not open '%s'"
-
 #define QERR_PERMISSION_DENIED \
     ERROR_CLASS_GENERIC_ERROR, "Insufficient permission to perform this operation"
 
-- 
1.8.1.4

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

[Anthony Liguori]

Pulled.  Thanks.

Regards,

Anthony Liguori

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

[Luiz Capitulino]

The following changes since commit 81ab11a7a524d12412a59ef49c6b270671e62ea0:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-26 15:41:50 +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 a631892f9d6440812af98588e9635f1a2a7260ff:

  Add HMP command "info memory-devices" (2014-09-26 13:37:06 -0400)

----------------------------------------------------------------
Fam Zheng (1):
      qemu-iotests: Test missing "driver" key for blockdev-add

Luiz Capitulino (1):
      virtio-balloon: fix integer overflow in memory stats feature

Markus Armbruster (2):
      qemu-socket: Polish errors for connect() and listen() failure
      qemu-socket: Eliminate silly QERR_ macros

Michael Roth (3):
      qapi: add visit_start_union and visit_end_union
      qapi: dealloc visitor, implement visit_start_union
      tests: add QMP input visitor test for unions with no discriminator

Stratos Psomadakis (1):
      monitor: Reset HMP mon->rs in CHR_EVENT_OPEN

Zhu Guihua (1):
      Add HMP command "info memory-devices"

 hmp-commands.hx                         |  2 ++
 hmp.c                                   | 38 +++++++++++++++++++++++++++++++++
 hmp.h                                   |  1 +
 hw/virtio/virtio-balloon.c              |  7 +++++-
 include/qapi/qmp/qerror.h               | 12 -----------
 include/qapi/visitor-impl.h             |  2 ++
 include/qapi/visitor.h                  |  2 ++
 monitor.c                               |  8 +++++++
 qapi/qapi-dealloc-visitor.c             | 26 ++++++++++++++++++++++
 qapi/qapi-visit-core.c                  | 15 +++++++++++++
 scripts/qapi-visit.py                   |  6 ++++++
 tests/qapi-schema/qapi-schema-test.json | 10 +++++++++
 tests/qapi-schema/qapi-schema-test.out  |  3 +++
 tests/qemu-iotests/087                  | 17 +++++++++++++++
 tests/qemu-iotests/087.out              | 13 +++++++++++
 tests/test-qmp-input-strict.c           | 17 +++++++++++++++
 util/qemu-sockets.c                     | 26 +++++++++++-----------
 17 files changed, 179 insertions(+), 26 deletions(-)

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

[Peter Maydell]

On 26 September 2014 20:03, Luiz Capitulino <lcapitulino@redhat.com> wrote:
> The following changes since commit 81ab11a7a524d12412a59ef49c6b270671e62ea0:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2014-09-26 15:41:50 +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 a631892f9d6440812af98588e9635f1a2a7260ff:
>
>   Add HMP command "info memory-devices" (2014-09-26 13:37:06 -0400)

Applied, thanks.

-- PMM