openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: unisys: visorbus: bus_configure add error handling 

Add proper error handling to bus_configure and have it propagate errors
back up the stack. This helped to streamline the function as well.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner 2016-11-21 12:15:53 -05:00 committed by Greg Kroah-Hartman
parent 5d295bc3e7
commit c71529fef3
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -820,14 +820,14 @@ bus_destroy(struct controlvm_message *inmsg)
return err; return err;
} }
static void static int
bus_configure(struct controlvm_message *inmsg, bus_configure(struct controlvm_message *inmsg,
struct parser_context *parser_ctx) struct parser_context *parser_ctx)
{ {
struct controlvm_message_packet *cmd = &inmsg->cmd; struct controlvm_message_packet *cmd = &inmsg->cmd;
u32 bus_no; u32 bus_no;
struct visor_device *bus_info; struct visor_device *bus_info;
int rc = CONTROLVM_RESP_SUCCESS; int err = 0;
bus_no = cmd->configure_bus.bus_no; bus_no = cmd->configure_bus.bus_no;
POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, bus_no, POSTCODE_LINUX_3(BUS_CONFIGURE_ENTRY_PC, bus_no,
@ -837,28 +837,41 @@ bus_configure(struct controlvm_message *inmsg,
if (!bus_info) { if (!bus_info) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no, POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_BUS_INVALID; err = -EINVAL;
goto err_respond;
} else if (bus_info->state.created == 0) { } else if (bus_info->state.created == 0) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no, POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_BUS_INVALID; err = -EINVAL;
goto err_respond;
} else if (bus_info->pending_msg_hdr) { } else if (bus_info->pending_msg_hdr) {
POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no, POSTCODE_LINUX_3(BUS_CONFIGURE_FAILURE_PC, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
rc = -CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT; err = -EIO;
} else { goto err_respond;
visorchannel_set_clientpartition
(bus_info->visorchannel,
cmd->configure_bus.guest_handle);
bus_info->partition_uuid = parser_id_get(parser_ctx);
parser_param_start(parser_ctx, PARSERSTRING_NAME);
bus_info->name = parser_string_get(parser_ctx);
POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, bus_no,
POSTCODE_SEVERITY_INFO);
} }
err = visorchannel_set_clientpartition
(bus_info->visorchannel,
cmd->configure_bus.guest_handle);
if (err)
goto err_respond;
bus_info->partition_uuid = parser_id_get(parser_ctx);
parser_param_start(parser_ctx, PARSERSTRING_NAME);
bus_info->name = parser_string_get(parser_ctx);
POSTCODE_LINUX_3(BUS_CONFIGURE_EXIT_PC, bus_no,
POSTCODE_SEVERITY_INFO);
if (inmsg->hdr.flags.response_expected == 1) if (inmsg->hdr.flags.response_expected == 1)
bus_responder(inmsg->hdr.id, &inmsg->hdr, rc); bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
return 0;
err_respond:
if (inmsg->hdr.flags.response_expected == 1)
bus_responder(inmsg->hdr.id, &inmsg->hdr, err);
return err;
} }
static void static void