| Message ID | 1481903493-26803-1-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/16/2016 10:51 AM, Wei Liu wrote: > xc_doamin_getinfo returns >=0 in success path, and if there is no vnode > configured, that rc will be returned to caller, which indicates error. > > Fix that by setting rc to 0 in success path. > > Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Signed-off-by: Wei Liu <wei.liu2@citrix.com> > --- > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > > Please squash this with "libxl: init_acpi_config should return rc > in exit path" when backporting to 4.8. > --- > tools/libxl/libxl_x86_acpi.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c > index 6cf0c30..173188f 100644 > --- a/tools/libxl/libxl_x86_acpi.c > +++ b/tools/libxl/libxl_x86_acpi.c > @@ -153,6 +153,7 @@ static int init_acpi_config(libxl__gc *gc, > config->lapic_id = acpi_lapic_id; > config->acpi_revision = 5; > > + rc = 0; > out: > return rc; > } You can also drop 'int rc = 0;' definition. Either way, Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c index 6cf0c30..173188f 100644 --- a/tools/libxl/libxl_x86_acpi.c +++ b/tools/libxl/libxl_x86_acpi.c @@ -153,6 +153,7 @@ static int init_acpi_config(libxl__gc *gc, config->lapic_id = acpi_lapic_id; config->acpi_revision = 5; + rc = 0; out: return rc; }
xc_doamin_getinfo returns >=0 in success path, and if there is no vnode configured, that rc will be returned to caller, which indicates error. Fix that by setting rc to 0 in success path. Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Please squash this with "libxl: init_acpi_config should return rc in exit path" when backporting to 4.8. --- tools/libxl/libxl_x86_acpi.c | 1 + 1 file changed, 1 insertion(+)