qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] b25d81: qmp hmp: Factor out common "using spi

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] b25d81: qmp hmp: Factor out common "using spice" test
Date: Thu, 05 Feb 2015 04:30:08 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b25d81ba332dc06757d40ffe64944ba27082de0a
      
https://github.com/qemu/qemu/commit/b25d81ba332dc06757d40ffe64944ba27082de0a
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M include/ui/qemu-spice.h
    M monitor.c
    M qmp.c

  Log Message:
  -----------
  qmp hmp: Factor out common "using spice" test

Into qemu_using_spice().  For want of a better place, put it next the
existing monitor command handler dummies in qemu-spice.h.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: cfa9bb236911eaa30ac58072105881a65cbbb612
      
https://github.com/qemu/qemu/commit/cfa9bb236911eaa30ac58072105881a65cbbb612
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M include/ui/qemu-spice.h

  Log Message:
  -----------
  qmp hmp: Improve error messages when SPICE is not in use

Commit 7572150 adopted QERR_DEVICE_NOT_ACTIVE for the purpose,
probably because adding another error seemed cumbersome overkill.
Produces "No spice device has been activated", which is awkward.

We've since abandoned our quest for "rich" error objects.  Time to
undo the damage to this error message.  Replace it by "SPICE is not in
use".

Keep the stupid DeviceNotActive ErrorClass for compatibility, even
though Libvirt doesn't use it.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: 206addd58f251666f5b64d43957ddcba465c0ef1
      
https://github.com/qemu/qemu/commit/206addd58f251666f5b64d43957ddcba465c0ef1
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: Compile hmp_info_spice() only with CONFIG_SPICE

It's dead code when CONFIG_SPICE is off.  If it wasn't, it would crash
dereferencing the null pointer returned by the qmp_query_spice()
dummy in qmp.c.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: ad0ec14bad645d9c0402047e858ea323151c8e9b
      
https://github.com/qemu/qemu/commit/ad0ec14bad645d9c0402047e858ea323151c8e9b
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M qmp.c

  Log Message:
  -----------
  qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy

QMP command query-spice exists only #ifdef CONFIG_SPICE.  Due to QAPI
limitations, we need a dummy function anyway, but it's unreachable.

Our current dummy function goes out of its way to produce the exact
same error as the QMP core does for unknown commands.  Cute, but both
unclean and unnecessary.  Replace by straight abort().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>


  Commit: bb5224edfb1e6f94aabaa8070d11c8f95f8ae277
      
https://github.com/qemu/qemu/commit/bb5224edfb1e6f94aabaa8070d11c8f95f8ae277
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  qmp: Simplify recognition of capability negotiation command

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: a6c90cbccdc07d51d4bbff71d2680f1a2c287370
      
https://github.com/qemu/qemu/commit/a6c90cbccdc07d51d4bbff71d2680f1a2c287370
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M include/qapi/qmp/qerror.h
    M monitor.c
    M qapi/qmp-dispatch.c

  Log Message:
  -----------
  qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro

The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments.  This trickiness has become pointless.  Clean
this one up.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 6502a14734e71b2f6dd079b0a1e546e6aa2d2f8d
      
https://github.com/qemu/qemu/commit/6502a14734e71b2f6dd079b0a1e546e6aa2d2f8d
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M balloon.c

  Log Message:
  -----------
  balloon: Inline qemu_balloon(), qemu_balloon_status()

... and simplify a bit.  Permits factoring out common error checks in
the next commit.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 422e0501a842fb4b3f42494f341707e809c3c6ad
      
https://github.com/qemu/qemu/commit/422e0501a842fb4b3f42494f341707e809c3c6ad
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

  Changed paths:
    M balloon.c

  Log Message:
  -----------
  balloon: Factor out common "is balloon active" test

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 2ad28a088d2cc8fd404dfa58fa1b80f9225425ff
      
https://github.com/qemu/qemu/commit/2ad28a088d2cc8fd404dfa58fa1b80f9225425ff
  Author: Markus Armbruster <address@hidden>
  Date:   2015-01-29 (Thu, 29 Jan 2015)

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

  Log Message:
  -----------
  balloon: Eliminate silly QERR_ macros

The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments.  This trickiness has become pointless.  Clean
up the balloon ones.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 2c918a245ca2a0b3339b8ded926b3f887d6d409e
      
https://github.com/qemu/qemu/commit/2c918a245ca2a0b3339b8ded926b3f887d6d409e
  Author: Peter Maydell <address@hidden>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M balloon.c
    M hmp.c
    M include/qapi/qmp/qerror.h
    M include/ui/qemu-spice.h
    M monitor.c
    M qapi/qmp-dispatch.c
    M qmp.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-05' into 
staging

qmp hmp balloon: Cleanups around error reporting

# gpg: Signature made Thu 05 Feb 2015 07:15:11 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"

* remotes/armbru/tags/pull-error-2015-02-05:
  balloon: Eliminate silly QERR_ macros
  balloon: Factor out common "is balloon active" test
  balloon: Inline qemu_balloon(), qemu_balloon_status()
  qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro
  qmp: Simplify recognition of capability negotiation command
  qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy
  hmp: Compile hmp_info_spice() only with CONFIG_SPICE
  qmp hmp: Improve error messages when SPICE is not in use
  qmp hmp: Factor out common "using spice" test

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/32193cb421ce...2c918a245ca2
reply via email to
[Prev in Thread] Current Thread [Next in Thread]