On Fri, Aug 07, 2009 at 11:06:23AM +0200, Chris Lalancette wrote:
Signed-off-by: Chris Lalancette <clalance@redhat.com> --- src/xen_internal.c | 8 ++++---- src/xend_internal.c | 2 +- src/xm_internal.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/xen_internal.c b/src/xen_internal.c index b6bf10d..ae78f84 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1147,7 +1147,7 @@ static const char *str_cap = "cap"; */ int xenHypervisorGetSchedulerParameters(virDomainPtr domain, - virSchedParameterPtr params, int *nparams) + virSchedParameterPtr params, int *nparams) { xenUnifiedPrivatePtr priv;
@@ -1209,19 +1209,19 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain, return(-1);
strncpy (params[0].field, str_weight, VIR_DOMAIN_SCHED_FIELD_LENGTH); - params[0].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0'; + params[0].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0'; params[0].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[0].value.ui = op_dom.u.getschedinfo.u.credit.weight;
strncpy (params[1].field, str_cap, VIR_DOMAIN_SCHED_FIELD_LENGTH); - params[1].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0'; + params[1].field[VIR_DOMAIN_SCHED_FIELD_LENGTH-1] = '\0'; params[1].type = VIR_DOMAIN_SCHED_FIELD_UINT; params[1].value.ui = op_dom.u.getschedinfo.u.credit.cap;
*nparams = 2; break; default: - virXenErrorFunc(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, + virXenErrorFunc(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, "Unknown scheduler", op_sys.u.getschedulerid.sched_id); return -1; } diff --git a/src/xend_internal.c b/src/xend_internal.c index 2585703..7bcee7d 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4732,7 +4732,7 @@ static const char *str_cap = "cap"; */ static int xenDaemonGetSchedulerParameters(virDomainPtr domain, - virSchedParameterPtr params, int *nparams) + virSchedParameterPtr params, int *nparams) { xenUnifiedPrivatePtr priv; struct sexpr *root; diff --git a/src/xm_internal.c b/src/xm_internal.c index c869120..b7f9e67 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1418,7 +1418,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { no_memory: virReportOOMError(conn); /* fallthrough */ - cleanup: +cleanup: virDomainGraphicsDefFree(graphics); virDomainNetDefFree(net); virDomainDiskDefFree(disk); --
ACK Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|