Merge tag 'pull-qapi-2022-04-05' of git://repo.or.cz/qemu/armbru into staging
QAPI patches patches for 2022-04-05
# gpg: Signature made Tue 05 Apr 2022 11:32:05 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* tag 'pull-qapi-2022-04-05' of git://repo.or.cz/qemu/armbru:
qapi: Fix calc-dirty-rate example
qapi: fix example of query-memdev command
qapi: fix example of query-cpus-fast command
qapi: fix example of trace-event-get-state command
qapi: fix example of query-colo-status command
qapi: fix example of query-vnc command
qapi: fix example of query-spice command
qapi: fix example of query-named-block-nodes command
qapi: fix examples: replay-break and replay-seek
qapi: fix example of netdev_add command
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
diff --git a/docs/system/devices/can.rst b/docs/system/devices/can.rst
index 16d72c3..fe37af8 100644
--- a/docs/system/devices/can.rst
+++ b/docs/system/devices/can.rst
@@ -182,7 +182,7 @@
(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 b70828e..6ed32ad 100644
--- a/hw/nvram/xlnx-bbram.c
+++ b/hw/nvram/xlnx-bbram.c
@@ -89,7 +89,7 @@
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);
