qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] eca01d: vl: add missing transition debug->fin


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] eca01d: vl: add missing transition debug->finish_migrate
Date: Mon, 13 Jan 2014 20:00:05 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: eca01d3a93be4041ac5858ef7676e60352e9c2ed
      
https://github.com/qemu/qemu/commit/eca01d3a93be4041ac5858ef7676e60352e9c2ed
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: add missing transition debug->finish_migrate

This fixes an abort if you invoke the "migrate" command while the
guest is being debugged.

Cc: address@hidden
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: abf233294bc8a4d2c7d5f428f1408d7bdd0c02e0
      
https://github.com/qemu/qemu/commit/abf233294bc8a4d2c7d5f428f1408d7bdd0c02e0
  Author: Jason J. Herne <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h

  Log Message:
  -----------
  qemu-monitor: HMP cpu-add wrapper

Add HMP cpu-add wrapper to allow cpu hot plugging via monitor.

Signed-off-by: Jason J. Herne <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 513b8c74c4c899cd940a79131e76c5568aa11381
      
https://github.com/qemu/qemu/commit/513b8c74c4c899cd940a79131e76c5568aa11381
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M backends/rng-random.c

  Log Message:
  -----------
  rng: initialize file descriptor to -1

The file descriptor is never initialized to -1, which makes rng-random
close stdin if an object is created and immediately destroyed.  If we
change it to -1, we also need to protect qemu_set_fd_handler from
receiving a bogus file descriptor.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 28ec2598ff7d74bd9556a1786f45fc5df2aacfe1
      
https://github.com/qemu/qemu/commit/28ec2598ff7d74bd9556a1786f45fc5df2aacfe1
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  qom: fix leak for objects created with -object

The object must be unref-ed when its variable goes out of scope.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: b0ed5e9feaf0e2881330a48c692f62e1ac6d9052
      
https://github.com/qemu/qemu/commit/b0ed5e9feaf0e2881330a48c692f62e1ac6d9052
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  qom: catch errors in object_property_add_child

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: ab2d0531b2e41bc5fd8f8e59405f135986599476
      
https://github.com/qemu/qemu/commit/ab2d0531b2e41bc5fd8f8e59405f135986599476
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M qapi-schema.json
    M qmp-commands.hx
    M qmp.c

  Log Message:
  -----------
  monitor: add object-del (QMP) and object_del (HMP) command

These two commands invoke the "unparent" method of Object.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: cff8b2c6fcdc9492d1141da11f55615843fa0a5e
      
https://github.com/qemu/qemu/commit/cff8b2c6fcdc9492d1141da11f55615843fa0a5e
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M include/monitor/monitor.h
    M include/qapi/visitor.h
    M include/qemu/typedefs.h
    M qapi-schema.json
    M qmp-commands.hx
    M qmp.c

  Log Message:
  -----------
  monitor: add object-add (QMP) and object_add (HMP) command

Add two commands that are the monitor counterparts of -object.  The commands
have the same Visitor-based implementation, but use different kinds of
visitors so that the HMP command has a DWIM string-based syntax, while
the QMP variant accepts a stricter JSON-based properties dictionary.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 5d24ee70bcbcf578614193526bcd5ed30a8eb16c
      
https://github.com/qemu/qemu/commit/5d24ee70bcbcf578614193526bcd5ed30a8eb16c
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M include/qapi/error.h
    M util/error.c

  Log Message:
  -----------
  error: Add error_abort

Add a special Error * that can be passed to error handling APIs to
signal that any errors are fatal and should abort QEMU. There are two
advantages to this:

- allows for brevity when wishing to assert success of Error **
  accepting APIs. No need for this pattern:
  Error * local_err = NULL;
  api_call(foo, bar, &local_err);
  assert_no_error(local_err);
  This also removes the need for _nofail variants of APIs with
  asserting call sites now reduced to 1LOC.
- SIGABRT happens from within the offending API. When a fatal error
  occurs in an API call (when the caller is asserting sucess) failure
  often means the API itself is broken. With the abort happening in the
  API call now, the stack frames into the call are available at debug
  time. In the assert_no_error scheme the abort happens after the fact.

The exact semantic is that when an error is raised, if the argument
Error ** matches &error_abort, then the abort occurs immediately. The
error messaged is reported.

For error_propagate, if the destination error is &error_abort, then
the abort happens at propagation time.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 90c3f6e02662d2d8edf059168a037a119ed208cb
      
https://github.com/qemu/qemu/commit/90c3f6e02662d2d8edf059168a037a119ed208cb
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M hw/core/qdev.c

  Log Message:
  -----------
  qdev: Delete dead code

This is unreachable code, as it's already asserted that no errors have
occurred. Delete.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 5433a0a89e68443c9ce1cd0c7b1af23320133983
      
https://github.com/qemu/qemu/commit/5433a0a89e68443c9ce1cd0c7b1af23320133983
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M hw/core/qdev-properties-system.c
    M hw/core/qdev-properties.c
    M hw/core/qdev.c
    M hw/dma/xilinx_axidma.c
    M hw/net/xilinx_axienet.c
    M include/hw/xilinx.h
    M target-arm/cpu.c

  Log Message:
  -----------
  hw: Remove assert_no_error usages

Replace assert_no_error() usages with the error_abort system.
&error_abort is passed into API calls to signal to the Error sub-system
that any errors are fatal. Removes need for caller assertions.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 00b810532446b1037aa5d299f181ac4d1d65aa9c
      
https://github.com/qemu/qemu/commit/00b810532446b1037aa5d299f181ac4d1d65aa9c
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Remove assert_no_error usage

Replace an assert_no_error() usage with the error_abort system.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 87ea75d5e135c0527c6a9dbac4317913409f28c7
      
https://github.com/qemu/qemu/commit/87ea75d5e135c0527c6a9dbac4317913409f28c7
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M block/blkdebug.c
    M block/blkverify.c
    M block/curl.c
    M block/gluster.c
    M block/iscsi.c
    M block/nbd.c
    M block/qcow2.c
    M block/raw-posix.c
    M block/raw-win32.c
    M block/rbd.c
    M block/sheepdog.c
    M block/vvfat.c
    M blockdev.c
    M hw/watchdog/watchdog.c
    M include/qemu/option.h
    M qdev-monitor.c
    M qemu-img.c
    M util/qemu-config.c
    M util/qemu-option.c
    M util/qemu-sockets.c
    M vl.c

  Log Message:
  -----------
  qemu-option: Remove qemu_opts_create_nofail

This is a boiler-plate _nofail variant of qemu_opts_create. Remove and
use error_abort in call sites.

null/0 arguments needs to be added for the id and fail_if_exists fields
in affected callsites due to argument inconsistency between the normal and
no_fail variants.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 594278718323ca7bffaab0fb7fc6c82fa2c1cd5f
      
https://github.com/qemu/qemu/commit/594278718323ca7bffaab0fb7fc6c82fa2c1cd5f
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M include/qapi/qmp/qerror.h
    M qobject/qerror.c

  Log Message:
  -----------
  qerror: Remove assert_no_error()

This is no longer needed, and is obsoleted by error_abort. Remove.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: c950114286ea358a93ce632db0421945e1008395
      
https://github.com/qemu/qemu/commit/c950114286ea358a93ce632db0421945e1008395
  Author: Luiz Capitulino <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  migration: qmp_migrate(): keep working after syntax error

If a user or QMP client enter a bad syntax for the migrate
command in QMP/HMP, then the migrate command will never succeed
from that point on.

For example, if you enter:

(qemu) migrate tcp;0:4444
migrate: Parameter 'uri' expects a valid migration protocol

Then the migrate command will always fail from now on:

(qemu) migrate tcp:0:4444
migrate: There's a migration process in progress

The problem is that qmp_migrate() sets the migration status to
MIG_STATE_SETUP and doesn't reset it on syntax error. This bug
was introduced by commit 29ae8a4133082e16970c9d4be09f4b6a15034617.

Reviewed-by: Michael R. Hines <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>


  Commit: 133fe77437d3a23bf1fd70a231b4f29d5fa0571c
      
https://github.com/qemu/qemu/commit/133fe77437d3a23bf1fd70a231b4f29d5fa0571c
  Author: Edgar E. Iglesias <address@hidden>
  Date:   2014-01-13 (Mon, 13 Jan 2014)

  Changed paths:
    M backends/rng-random.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/curl.c
    M block/gluster.c
    M block/iscsi.c
    M block/nbd.c
    M block/qcow2.c
    M block/raw-posix.c
    M block/raw-win32.c
    M block/rbd.c
    M block/sheepdog.c
    M block/vvfat.c
    M blockdev.c
    M hmp-commands.hx
    M hmp.c
    M hmp.h
    M hw/core/qdev-properties-system.c
    M hw/core/qdev-properties.c
    M hw/core/qdev.c
    M hw/dma/xilinx_axidma.c
    M hw/net/xilinx_axienet.c
    M hw/watchdog/watchdog.c
    M include/hw/xilinx.h
    M include/monitor/monitor.h
    M include/qapi/error.h
    M include/qapi/qmp/qerror.h
    M include/qapi/visitor.h
    M include/qemu/option.h
    M include/qemu/typedefs.h
    M migration.c
    M qapi-schema.json
    M qdev-monitor.c
    M qemu-img.c
    M qmp-commands.hx
    M qmp.c
    M qobject/qerror.c
    M qom/object.c
    M target-arm/cpu.c
    M target-i386/cpu.c
    M util/error.c
    M util/qemu-config.c
    M util/qemu-option.c
    M util/qemu-sockets.c
    M vl.c

  Log Message:
  -----------
  Merge remote branch 'luiz/queue/qmp' into qmpq

* luiz/queue/qmp:
  migration: qmp_migrate(): keep working after syntax error
  qerror: Remove assert_no_error()
  qemu-option: Remove qemu_opts_create_nofail
  target-i386: Remove assert_no_error usage
  hw: Remove assert_no_error usages
  qdev: Delete dead code
  error: Add error_abort
  monitor: add object-add (QMP) and object_add (HMP) command
  monitor: add object-del (QMP) and object_del (HMP) command
  qom: catch errors in object_property_add_child
  qom: fix leak for objects created with -object
  rng: initialize file descriptor to -1
  qemu-monitor: HMP cpu-add wrapper
  vl: add missing transition debug->finish_migrate

Message-Id: address@hidden
Signed-off-by: Edgar E. Iglesias <address@hidden>


Compare: https://github.com/qemu/qemu/compare/73c694565c61...133fe77437d3

reply via email to

[Prev in Thread] Current Thread [Next in Thread]