3 files changed, 4 insertions, 8 deletions
diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index 56f915e7c9..1328967461 100644
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -106,8 +106,7 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)
 
     for (i = 0; i < nports; i++) {
         s = pci->state + i;
-        qdev_realize(DEVICE(s), NULL, &err);
-        if (err != NULL) {
+        if (!qdev_realize(DEVICE(s), NULL, &err)) {
             error_propagate(errp, err);
             multi_serial_pci_exit(dev);
             return;
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 298f3adba7..d22617426b 100644
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -49,8 +49,7 @@ static void serial_pci_realize(PCIDevice *dev, Error **errp)
     SerialState *s = &pci->state;
     Error *err = NULL;
 
-    qdev_realize(DEVICE(s), NULL, &err);
-    if (err != NULL) {
+    if (!qdev_realize(DEVICE(s), NULL, &err)) {
         error_propagate(errp, err);
         return;
     }
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 9eebcb27e7..e69096eace 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -991,8 +991,7 @@ static void serial_io_realize(DeviceState *dev, Error **errp)
     SerialState *s = &sio->serial;
     Error *local_err = NULL;
 
-    qdev_realize(DEVICE(s), NULL, &local_err);
-    if (local_err) {
+    if (!qdev_realize(DEVICE(s), NULL, &local_err)) {
         error_propagate(errp, local_err);
         return;
     }
@@ -1098,8 +1097,7 @@ static void serial_mm_realize(DeviceState *dev, Error **errp)
     SerialState *s = &smm->serial;
     Error *local_err = NULL;
 
-    qdev_realize(DEVICE(s), NULL, &local_err);
-    if (local_err) {
+    if (!qdev_realize(DEVICE(s), NULL, &local_err)) {
         error_propagate(errp, local_err);
         return;
     }