Re: [libvirt] [PATCH 2/2] Adding Storage Management driver (style and indentation)
On 06/23/2010 04:49 PM, Eduardo Otubo wrote:
This is just the indentation, style and cleanup patch.
---
src/phyp/phyp_driver.c | 100 +++++++++++++++++++++++++++--------------------
src/phyp/phyp_driver.h | 13 ++++--
2 files changed, 66 insertions(+), 47 deletions(-)
I'm actually going to focus on this one first. Any style changes to new
code should have been folded in with the new code. In particular, this
patch touches a lot of VIR_ERROR() calls added in your other patch, but
if the other patch is committed first, then you have created a situation
where 'git bisect' would needlessly fail 'make syntax-check' when
visiting that commit. Therefore, I'm pruning out the changes to new
code and squashing them into the 1/2 patch, which leaves:
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 51bab2c..7e39dfd 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -656,7 +656,8 @@ phypGetLparMem(virConnectPtr conn, const char *managed_system, int
lpar_id,
virBufferAddLit(&buf, "lshwres");
if (system_type == HMC)
virBufferVSprintf(&buf, " -m %s", managed_system);
- virBufferVSprintf(&buf, " -r mem --level lpar -F %s --filter
lpar_ids=%d",
+ virBufferVSprintf(&buf,
+ " -r mem --level lpar -F %s --filter lpar_ids=%d",
type ? "curr_mem" : "curr_max_mem", lpar_id);
if (virBufferError(&buf)) {
virBufferFreeAndReset(&buf);
A few lines like this of indentation wrapping...
@@ -3798,7 +3812,7 @@ phypUUIDTable_Push(virConnectPtr conn)
/* end of file */
break;
} else {
- VIR_ERROR(_("Failed to read from '%s'"), local_file);
+ VIR_ERROR(_("Failed to read from %s"), local_file);
goto err;
}
}
And this change in the use of quotes of this message.
diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h
index e738927..14103f2 100644
--- a/src/phyp/phyp_driver.h
+++ b/src/phyp/phyp_driver.h
All of the changes to phyp_driver.h were in code introduced in 1/2, so
I'm just squashing those.
ACK to these minor cleanups that were not tied to 1/2, so I pushed them
as attached:
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
Attachments:
- signature.asc (application/pgp-signature — 619 bytes)
- 0001-Adding-Storage-Management-driver-style-and-indentati.patch (text/plain — 3.4 KB)