diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-23 10:38:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-23 10:38:00 +0100 |
| commit | a3206972a9eab65ec8e8f9ae320ad628ba4b58f1 (patch) | |
| tree | f5109b0cced9784dde30aa2877aea30651933eee /hw/net | |
| parent | 0c8ff723bd29e5c8b2ca989f857ae5c37ec49c4e (diff) | |
| parent | a0b1a66ea39bca011108734147a72232a4d08c7a (diff) | |
| download | qemu-a3206972a9eab65ec8e8f9ae320ad628ba4b58f1.zip qemu-a3206972a9eab65ec8e8f9ae320ad628ba4b58f1.tar.gz qemu-a3206972a9eab65ec8e8f9ae320ad628ba4b58f1.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging
Monitor patches
# gpg: Signature made Mon Jun 22 18:56:18 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-monitor-2015-06-22: (24 commits)
Include monitor/monitor.h exactly where needed
Include qapi/qmp/qerror.h exactly where needed
qerror: Move #include out of qerror.h
qerror: Finally unused, clean up
qmp: Wean off qerror_report()
tpm: Avoid qerror_report() outside QMP command handlers
qerror: Clean up QERR_ macros to expand into a single string
qerror: Eliminate QERR_DEVICE_NOT_FOUND
vl: Use error_report() for --display errors
vl: Avoid qerror_report() outside QMP command handlers
QemuOpts: Wean off qerror_report_err()
qdev-monitor: Propagate errors through qdev_device_add()
qdev-monitor: Propagate errors through set_property()
qdev-monitor: Convert qbus_find() to Error
qdev-monitor: Fix check for full bus
qdev-monitor: Stop error avalanche in qbus_find_recursive()
disas: Remove uses of CPU env
monitor: Split mon_get_cpu fn to remove ENV_GET_CPU
monitor: Fix failure path for "S" argument
monitor: Point to "help" command on syntax error
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/rocker/qmp-norocker.c | 8 | ||||
| -rw-r--r-- | hw/net/xilinx_axienet.c | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c index f253747..49b498b 100644 --- a/hw/net/rocker/qmp-norocker.c +++ b/hw/net/rocker/qmp-norocker.c @@ -21,13 +21,13 @@ RockerSwitch *qmp_query_rocker(const char *name, Error **errp) { - error_set(errp, QERR_FEATURE_DISABLED, "rocker"); + error_setg(errp, QERR_FEATURE_DISABLED, "rocker"); return NULL; }; RockerPortList *qmp_query_rocker_ports(const char *name, Error **errp) { - error_set(errp, QERR_FEATURE_DISABLED, "rocker"); + error_setg(errp, QERR_FEATURE_DISABLED, "rocker"); return NULL; }; @@ -36,7 +36,7 @@ RockerOfDpaFlowList *qmp_query_rocker_of_dpa_flows(const char *name, uint32_t tbl_id, Error **errp) { - error_set(errp, QERR_FEATURE_DISABLED, "rocker"); + error_setg(errp, QERR_FEATURE_DISABLED, "rocker"); return NULL; }; @@ -45,6 +45,6 @@ RockerOfDpaGroupList *qmp_query_rocker_of_dpa_groups(const char *name, uint8_t type, Error **errp) { - error_set(errp, QERR_FEATURE_DISABLED, "rocker"); + error_setg(errp, QERR_FEATURE_DISABLED, "rocker"); return NULL; }; diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 21efedf..9205770 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -26,7 +26,6 @@ #include "qemu/log.h" #include "net/net.h" #include "net/checksum.h" -#include "qapi/qmp/qerror.h" #include "hw/stream.h" |