7 files changed, 7 insertions, 14 deletions
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index b1791098a..14dc97336 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -104,8 +104,7 @@ typedef struct _myPrivate {
 pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice)
 {
     GETDMXLOCALFROMPDEVICE;
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->dmxLocal  = dmxLocal;
     return priv;
 }
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index b2a2ec302..48c7034cb 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -140,8 +140,7 @@ static int unscaley(myPrivate *priv, int y)
 pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
 {
     GETDMXLOCALFROMPDEVICE;
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->dmxLocal  = dmxLocal;
     return priv;
 }
diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c
index cc55eedff..e7f5b5919 100644
--- a/hw/dmx/input/dmxmotion.c
+++ b/hw/dmx/input/dmxmotion.c
@@ -113,8 +113,7 @@ void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
                                      * DMX_MOTION_SIZE);
         dmxLocal->head      = 0;
         dmxLocal->tail      = 0;
-        dmxLocal->valuators = xalloc(sizeof(*dmxLocal->valuators) * numAxes);
-        memset(dmxLocal->valuators, 0, sizeof(*dmxLocal->valuators) * numAxes);
+        dmxLocal->valuators = xcalloc(sizeof(*dmxLocal->valuators), numAxes);
     } else {
         if (++dmxLocal->tail >= DMX_MOTION_SIZE) dmxLocal->tail = 0;
         if (dmxLocal->head == dmxLocal->tail)
diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c
index 42a807b11..c5dada911 100644
--- a/hw/dmx/input/lnx-keyboard.c
+++ b/hw/dmx/input/lnx-keyboard.c
@@ -358,8 +358,7 @@ static unsigned char at2lnx[NUM_KEYCODES] =
 /** Create a private structure for use within this file. */
 pointer kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard)
 {
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->fd        = -1;
     priv->pKeyboard = pKeyboard;
     return priv;
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index b3692a071..705d3f4ac 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -292,8 +292,7 @@ void msLinuxVTPostSwitch(pointer p)
 /** Create a private structure for use within this file. */
 pointer msLinuxCreatePrivate(DeviceIntPtr pMouse)
 {
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->fd     = -1;
     priv->pMouse = pMouse;
     return priv;
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 8b906df5f..78debed18 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -260,8 +260,7 @@ void ps2LinuxVTPostSwitch(pointer p)
 /** Create a private structure for use within this file. */
 pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
 {
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->fd     = -1;
     priv->pMouse = pMouse;
     return priv;
diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c
index 70695d0f1..7b4f632dc 100644
--- a/hw/dmx/input/usb-common.c
+++ b/hw/dmx/input/usb-common.c
@@ -368,8 +368,7 @@ void usbOff(DevicePtr pDev)
 /** Create a private structure for use within this file. */
 pointer usbCreatePrivate(DeviceIntPtr pDevice)
 {
-    myPrivate *priv = xalloc(sizeof(*priv));
-    memset(priv, 0, sizeof(*priv));
+    myPrivate *priv = xcalloc(1, sizeof(*priv));
     priv->fd        = -1;
     priv->pDevice   = pDevice;
     return priv;