From: Eric Blake <eblake@redhat.com>
Date: Wed, 13 Apr 2011 20:59:06 +0000 (-0600)
Subject: phyp: prefer memcpy over memmove when legal
X-Git-Tag: v0.9.1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00c892f0b99fe5de4a1b8583191277c094012e6;p=thirdparty%2Flibvirt.git

phyp: prefer memcpy over memmove when legal

* src/phyp/phyp_driver.c (phypUUIDTable_AddLpar)
(phypGetLparUUID, phypGetStoragePoolUUID, phypVolumeGetXMLDesc)
(phypGetStoragePoolXMLDesc): Use faster method.
---

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index a952875de1..27536eb151 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -624,7 +624,7 @@ phypUUIDTable_AddLpar(virConnectPtr conn, unsigned char *uuid, int id)
     }
 
     uuid_table->lpars[i]->id = id;
-    memmove(uuid_table->lpars[i]->uuid, uuid, VIR_UUID_BUFLEN);
+    memcpy(uuid_table->lpars[i]->uuid, uuid, VIR_UUID_BUFLEN);
 
     if (phypUUIDTable_WriteFile(conn) == -1)
         goto err;
@@ -1388,7 +1388,7 @@ phypGetLparUUID(unsigned char *uuid, int lpar_id, virConnectPtr conn)
 
     for (i = 0; i < uuid_table->nlpars; i++) {
         if (lpars[i]->id == lpar_id) {
-            memmove(uuid, lpars[i]->uuid, VIR_UUID_BUFLEN);
+            memcpy(uuid, lpars[i]->uuid, VIR_UUID_BUFLEN);
             return 0;
         }
     }
@@ -2609,7 +2609,7 @@ phypGetStoragePoolUUID(virConnectPtr conn, unsigned char *uuid,
     if (exit_status < 0 || ret == NULL)
         goto cleanup;
 
-    if (memmove(uuid, ret, VIR_UUID_BUFLEN) == NULL)
+    if (memcpy(uuid, ret, VIR_UUID_BUFLEN) == NULL)
         goto cleanup;
 
     result = 0;
@@ -2657,7 +2657,7 @@ phypVolumeGetXMLDesc(virStorageVolPtr vol, unsigned int flags)
         goto err;
     }
 
-    if (memmove(pool.uuid, sp->uuid, VIR_UUID_BUFLEN) == NULL) {
+    if (memcpy(pool.uuid, sp->uuid, VIR_UUID_BUFLEN) == NULL) {
         VIR_ERROR0(_("Unable to determine storage sp's uuid."));
         goto err;
     }
@@ -3241,7 +3241,7 @@ phypGetStoragePoolXMLDesc(virStoragePoolPtr pool, unsigned int flags)
         goto err;
     }
 
-    if (memmove(def.uuid, pool->uuid, VIR_UUID_BUFLEN) == NULL) {
+    if (memcpy(def.uuid, pool->uuid, VIR_UUID_BUFLEN) == NULL) {
         VIR_ERROR0(_("Unable to determine storage pool's uuid."));
         goto err;
     }