diff options
| -rw-r--r-- | docs/system/devices/can.rst | 6 | ||||
| -rw-r--r-- | hw/nvram/xlnx-bbram.c | 2 | ||||
| -rw-r--r-- | qapi/block-core.json | 1 | ||||
| -rw-r--r-- | qapi/machine.json | 4 | ||||
| -rw-r--r-- | qapi/migration.json | 4 | ||||
| -rw-r--r-- | qapi/net.json | 2 | ||||
| -rw-r--r-- | qapi/replay.json | 4 | ||||
| -rw-r--r-- | qapi/trace.json | 2 | ||||
| -rw-r--r-- | qapi/ui.json | 3 |
9 files changed, 16 insertions, 12 deletions
diff --git a/docs/system/devices/can.rst b/docs/system/devices/can.rst index 16d72c3ac3..fe37af8223 100644 --- a/docs/system/devices/can.rst +++ b/docs/system/devices/can.rst @@ -182,7 +182,7 @@ Links to other resources (5) `GNU/Linux, CAN and CANopen in Real-time Control Applications Slides from LinuxDays 2017 (include updated RTLWS 2015 content) <https://www.linuxdays.cz/2017/video/Pavel_Pisa-CAN_canopen.pdf>`_ (6) `Linux SocketCAN utilities <https://github.com/linux-can/can-utils>`_ (7) `CTU CAN FD project including core VHDL design, Linux driver, test utilities etc. <https://gitlab.fel.cvut.cz/canbus/ctucanfd_ip_core>`_ - (8) `CTU CAN FD Core Datasheet Documentation <http://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/Progdokum.pdf>`_ - (9) `CTU CAN FD Core System Architecture Documentation <http://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/ctu_can_fd_architecture.pdf>`_ - (10) `CTU CAN FD Driver Documentation <http://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/driver_doc/ctucanfd-driver.html>`_ + (8) `CTU CAN FD Core Datasheet Documentation <http://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/Datasheet.pdf>`_ + (9) `CTU CAN FD Core System Architecture Documentation <http://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/System_Architecture.pdf>`_ + (10) `CTU CAN FD Driver Documentation <https://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/linux_driver/build/ctucanfd-driver.html>`_ (11) `Integration with PCIe interfacing for Intel/Altera Cyclone IV based board <https://gitlab.fel.cvut.cz/canbus/pcie-ctu_can_fd>`_ diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index b70828e5bf..6ed32adad9 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -89,7 +89,7 @@ static bool bbram_pgm_enabled(XlnxBBRam *s) static void bbram_bdrv_error(XlnxBBRam *s, int rc, gchar *detail) { - Error *errp; + Error *errp = NULL; error_setg_errno(&errp, -rc, "%s: BBRAM backstore %s failed.", blk_name(s->blk), detail); diff --git a/qapi/block-core.json b/qapi/block-core.json index 4a7a6940a3..beeb91952a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1776,6 +1776,7 @@ # "file":"disks/test.qcow2", # "node-name": "my-node", # "backing_file_depth":1, +# "detect_zeroes":"off", # "bps":1000000, # "bps_rd":0, # "bps_wr":0, diff --git a/qapi/machine.json b/qapi/machine.json index 9c460ec450..d25a481ce4 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -109,7 +109,6 @@ # "socket-id": 0 # }, # "qom-path": "/machine/unattached/device[0]", -# "arch":"x86", # "target":"x86_64", # "cpu-index": 0 # }, @@ -121,7 +120,6 @@ # "socket-id": 1 # }, # "qom-path": "/machine/unattached/device[2]", -# "arch":"x86", # "target":"x86_64", # "cpu-index": 1 # } @@ -841,6 +839,7 @@ # "merge": false, # "dump": true, # "prealloc": false, +# "share": false, # "host-nodes": [0, 1], # "policy": "bind" # }, @@ -849,6 +848,7 @@ # "merge": false, # "dump": true, # "prealloc": true, +# "share": false, # "host-nodes": [2, 3], # "policy": "preferred" # } diff --git a/qapi/migration.json b/qapi/migration.json index 092a63354b..27d7b28158 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1679,7 +1679,7 @@ # Example: # # -> { "execute": "query-colo-status" } -# <- { "return": { "mode": "primary", "reason": "request" } } +# <- { "return": { "mode": "primary", "last-mode": "none", "reason": "request" } } # # Since: 3.1 ## @@ -1845,7 +1845,7 @@ # Since: 5.2 # # Example: -# {"command": "calc-dirty-rate", "arguments": {"calc-time": 1, +# {"execute": "calc-dirty-rate", "arguments": {"calc-time": 1, # 'sample-pages': 512} } # ## diff --git a/qapi/net.json b/qapi/net.json index 0d4578bd07..b92f3f5fb4 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -51,7 +51,7 @@ # # -> { "execute": "netdev_add", # "arguments": { "type": "user", "id": "netdev1", -# "dnssearch": "example.org" } } +# "dnssearch": [ { "str": "example.org" } ] } } # <- { "return": {} } # ## diff --git a/qapi/replay.json b/qapi/replay.json index b4d1ba253b..351898f60d 100644 --- a/qapi/replay.json +++ b/qapi/replay.json @@ -81,7 +81,7 @@ # # Example: # -# -> { "execute": "replay-break", "data": { "icount": 220414 } } +# -> { "execute": "replay-break", "arguments": { "icount": 220414 } } # ## { 'command': 'replay-break', 'data': { 'icount': 'int' } } @@ -117,6 +117,6 @@ # # Example: # -# -> { "execute": "replay-seek", "data": { "icount": 220414 } } +# -> { "execute": "replay-seek", "arguments": { "icount": 220414 } } ## { 'command': 'replay-seek', 'data': { 'icount': 'int' } } diff --git a/qapi/trace.json b/qapi/trace.json index 119509f565..6c6982a587 100644 --- a/qapi/trace.json +++ b/qapi/trace.json @@ -69,7 +69,7 @@ # # -> { "execute": "trace-event-get-state", # "arguments": { "name": "qemu_memalign" } } -# <- { "return": [ { "name": "qemu_memalign", "state": "disabled" } ] } +# <- { "return": [ { "name": "qemu_memalign", "state": "disabled", "vcpu": false } ] } # ## { 'command': 'trace-event-get-state', diff --git a/qapi/ui.json b/qapi/ui.json index a810ed680c..13a8bb82aa 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -324,8 +324,10 @@ # "enabled": true, # "auth": "spice", # "port": 5920, +# "migrated":false, # "tls-port": 5921, # "host": "0.0.0.0", +# "mouse-mode":"client", # "channels": [ # { # "port": "54924", @@ -656,6 +658,7 @@ # "host":"127.0.0.1", # "service":"50401", # "family":"ipv4" +# "websocket":false, # } # ] # } |