mirror of https://gitee.com/openkylin/linux.git
staging: unisys: visorbus: Merge controlvm completion status to controlvmchannel
The completion status are valid only for the controlvm channel so they should be moved into its header file. Signed-off-by: David Kershner <david.kershner@unisys.com> Reviewed-by: Tim Sell <Timothy.Sell@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
Greg Kroah-Hartman
parent
e308d698bc
commit
8a7a2fde4d
|
|
@ -482,4 +482,80 @@ struct spar_controlvm_parameters_header {
|
||||||
u32 reserved; /* Natural alignment */
|
u32 reserved; /* Natural alignment */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* General Errors------------------------------------------------------[0-99] */
|
||||||
|
#define CONTROLVM_RESP_SUCCESS 0
|
||||||
|
#define CONTROLVM_RESP_ERROR_ALREADY_DONE 1
|
||||||
|
#define CONTROLVM_RESP_ERROR_IOREMAP_FAILED 2
|
||||||
|
#define CONTROLVM_RESP_ERROR_KMALLOC_FAILED 3
|
||||||
|
#define CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN 4
|
||||||
|
#define CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT 5
|
||||||
|
|
||||||
|
/* CONTROLVM_INIT_CHIPSET-------------------------------------------[100-199] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_CLIENT_SWITCHCOUNT_NONZERO 100
|
||||||
|
#define CONTROLVM_RESP_ERROR_EXPECTED_CHIPSET_INIT 101
|
||||||
|
|
||||||
|
/* Maximum Limit----------------------------------------------------[200-299] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_MAX_BUSES 201 /* BUS_CREATE */
|
||||||
|
#define CONTROLVM_RESP_ERROR_MAX_DEVICES 202 /* DEVICE_CREATE */
|
||||||
|
/* Payload and Parameter Related------------------------------------[400-499] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_PAYLOAD_INVALID 400 /* SWITCH_ATTACHEXTPORT,
|
||||||
|
* DEVICE_CONFIGURE
|
||||||
|
*/
|
||||||
|
#define CONTROLVM_RESP_ERROR_INITIATOR_PARAMETER_INVALID 401 /* Multiple */
|
||||||
|
#define CONTROLVM_RESP_ERROR_TARGET_PARAMETER_INVALID 402 /* DEVICE_CONFIGURE */
|
||||||
|
#define CONTROLVM_RESP_ERROR_CLIENT_PARAMETER_INVALID 403 /* DEVICE_CONFIGURE */
|
||||||
|
/* Specified[Packet Structure] Value-------------------------------[500-599] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_BUS_INVALID 500 /* SWITCH_ATTACHINTPORT,
|
||||||
|
* BUS_CONFIGURE,
|
||||||
|
* DEVICE_CREATE,
|
||||||
|
* DEVICE_CONFIG
|
||||||
|
* DEVICE_DESTROY
|
||||||
|
*/
|
||||||
|
#define CONTROLVM_RESP_ERROR_DEVICE_INVALID 501 /* SWITCH_ATTACHINTPORT */
|
||||||
|
/* DEVICE_CREATE,
|
||||||
|
* DEVICE_CONFIGURE,
|
||||||
|
* DEVICE_DESTROY
|
||||||
|
*/
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHANNEL_INVALID 502 /* DEVICE_CREATE,
|
||||||
|
* DEVICE_CONFIGURE
|
||||||
|
*/
|
||||||
|
/* Partition Driver Callback Interface----------------------[600-699] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE 604 /* BUS_CREATE,
|
||||||
|
* BUS_DESTROY,
|
||||||
|
* DEVICE_CREATE,
|
||||||
|
* DEVICE_DESTROY
|
||||||
|
*/
|
||||||
|
/* Unable to invoke VIRTPCI callback */
|
||||||
|
#define CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR 605
|
||||||
|
/* BUS_CREATE,
|
||||||
|
* BUS_DESTROY,
|
||||||
|
* DEVICE_CREATE,
|
||||||
|
* DEVICE_DESTROY
|
||||||
|
*/
|
||||||
|
/* VIRTPCI Callback returned error */
|
||||||
|
#define CONTROLVM_RESP_ERROR_GENERIC_DRIVER_CALLBACK_ERROR 606
|
||||||
|
/* SWITCH_ATTACHEXTPORT,
|
||||||
|
* SWITCH_DETACHEXTPORT
|
||||||
|
* DEVICE_CONFIGURE
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* generic device callback returned error */
|
||||||
|
/* Bus Related------------------------------------------------------[700-799] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_BUS_DEVICE_ATTACHED 700 /* BUS_DESTROY */
|
||||||
|
/* Channel Related--------------------------------------------------[800-899] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN 800 /* GET_CHANNELINFO,
|
||||||
|
* DEVICE_DESTROY
|
||||||
|
*/
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHANNEL_SIZE_TOO_SMALL 801 /* DEVICE_CREATE */
|
||||||
|
/* Chipset Shutdown Related---------------------------------------[1000-1099] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHIPSET_SHUTDOWN_FAILED 1000
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHIPSET_SHUTDOWN_ALREADY_ACTIVE 1001
|
||||||
|
|
||||||
|
/* Chipset Stop Related-------------------------------------------[1100-1199] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHIPSET_STOP_FAILED_BUS 1100
|
||||||
|
#define CONTROLVM_RESP_ERROR_CHIPSET_STOP_FAILED_SWITCH 1101
|
||||||
|
|
||||||
|
/* Device Related-------------------------------------------------[1400-1499] */
|
||||||
|
#define CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT 1400
|
||||||
|
|
||||||
#endif /* __CONTROLVMCHANNEL_H__ */
|
#endif /* __CONTROLVMCHANNEL_H__ */
|
||||||
|
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
/* controlvmcompletionstatus.c
|
|
||||||
*
|
|
||||||
* Copyright (C) 2010 - 2015 UNISYS CORPORATION
|
|
||||||
* All Rights Reserved.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU General Public License,
|
|
||||||
* version 2, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful, but
|
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
||||||
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
||||||
* details.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Defines for all valid values returned in the response message header
|
|
||||||
* completionStatus field. See controlvmchannel.h for description of
|
|
||||||
* the header: _CONTROLVM_MESSAGE_HEADER.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __CONTROLVMCOMPLETIONSTATUS_H__
|
|
||||||
#define __CONTROLVMCOMPLETIONSTATUS_H__
|
|
||||||
|
|
||||||
/* General Errors------------------------------------------------------[0-99] */
|
|
||||||
#define CONTROLVM_RESP_SUCCESS 0
|
|
||||||
#define CONTROLVM_RESP_ERROR_ALREADY_DONE 1
|
|
||||||
#define CONTROLVM_RESP_ERROR_IOREMAP_FAILED 2
|
|
||||||
#define CONTROLVM_RESP_ERROR_KMALLOC_FAILED 3
|
|
||||||
#define CONTROLVM_RESP_ERROR_MESSAGE_ID_UNKNOWN 4
|
|
||||||
#define CONTROLVM_RESP_ERROR_MESSAGE_ID_INVALID_FOR_CLIENT 5
|
|
||||||
|
|
||||||
/* CONTROLVM_INIT_CHIPSET-------------------------------------------[100-199] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_CLIENT_SWITCHCOUNT_NONZERO 100
|
|
||||||
#define CONTROLVM_RESP_ERROR_EXPECTED_CHIPSET_INIT 101
|
|
||||||
|
|
||||||
/* Maximum Limit----------------------------------------------------[200-299] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_MAX_BUSES 201 /* BUS_CREATE */
|
|
||||||
#define CONTROLVM_RESP_ERROR_MAX_DEVICES 202 /* DEVICE_CREATE */
|
|
||||||
/* Payload and Parameter Related------------------------------------[400-499] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_PAYLOAD_INVALID 400 /* SWITCH_ATTACHEXTPORT,
|
|
||||||
* DEVICE_CONFIGURE
|
|
||||||
*/
|
|
||||||
#define CONTROLVM_RESP_ERROR_INITIATOR_PARAMETER_INVALID 401 /* Multiple */
|
|
||||||
#define CONTROLVM_RESP_ERROR_TARGET_PARAMETER_INVALID 402 /* DEVICE_CONFIGURE */
|
|
||||||
#define CONTROLVM_RESP_ERROR_CLIENT_PARAMETER_INVALID 403 /* DEVICE_CONFIGURE */
|
|
||||||
/* Specified[Packet Structure] Value-------------------------------[500-599] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_BUS_INVALID 500 /* SWITCH_ATTACHINTPORT,
|
|
||||||
* BUS_CONFIGURE,
|
|
||||||
* DEVICE_CREATE,
|
|
||||||
* DEVICE_CONFIG
|
|
||||||
* DEVICE_DESTROY
|
|
||||||
*/
|
|
||||||
#define CONTROLVM_RESP_ERROR_DEVICE_INVALID 501 /* SWITCH_ATTACHINTPORT */
|
|
||||||
/* DEVICE_CREATE,
|
|
||||||
* DEVICE_CONFIGURE,
|
|
||||||
* DEVICE_DESTROY
|
|
||||||
*/
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHANNEL_INVALID 502 /* DEVICE_CREATE,
|
|
||||||
* DEVICE_CONFIGURE
|
|
||||||
*/
|
|
||||||
/* Partition Driver Callback Interface----------------------[600-699] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_FAILURE 604 /* BUS_CREATE,
|
|
||||||
* BUS_DESTROY,
|
|
||||||
* DEVICE_CREATE,
|
|
||||||
* DEVICE_DESTROY
|
|
||||||
*/
|
|
||||||
/* Unable to invoke VIRTPCI callback */
|
|
||||||
#define CONTROLVM_RESP_ERROR_VIRTPCI_DRIVER_CALLBACK_ERROR 605
|
|
||||||
/* BUS_CREATE,
|
|
||||||
* BUS_DESTROY,
|
|
||||||
* DEVICE_CREATE,
|
|
||||||
* DEVICE_DESTROY
|
|
||||||
*/
|
|
||||||
/* VIRTPCI Callback returned error */
|
|
||||||
#define CONTROLVM_RESP_ERROR_GENERIC_DRIVER_CALLBACK_ERROR 606
|
|
||||||
/* SWITCH_ATTACHEXTPORT,
|
|
||||||
* SWITCH_DETACHEXTPORT
|
|
||||||
* DEVICE_CONFIGURE
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* generic device callback returned error */
|
|
||||||
/* Bus Related------------------------------------------------------[700-799] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_BUS_DEVICE_ATTACHED 700 /* BUS_DESTROY */
|
|
||||||
/* Channel Related--------------------------------------------------[800-899] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHANNEL_TYPE_UNKNOWN 800 /* GET_CHANNELINFO,
|
|
||||||
* DEVICE_DESTROY
|
|
||||||
*/
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHANNEL_SIZE_TOO_SMALL 801 /* DEVICE_CREATE */
|
|
||||||
/* Chipset Shutdown Related---------------------------------------[1000-1099] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHIPSET_SHUTDOWN_FAILED 1000
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHIPSET_SHUTDOWN_ALREADY_ACTIVE 1001
|
|
||||||
|
|
||||||
/* Chipset Stop Related-------------------------------------------[1100-1199] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHIPSET_STOP_FAILED_BUS 1100
|
|
||||||
#define CONTROLVM_RESP_ERROR_CHIPSET_STOP_FAILED_SWITCH 1101
|
|
||||||
|
|
||||||
/* Device Related-------------------------------------------------[1400-1499] */
|
|
||||||
#define CONTROLVM_RESP_ERROR_DEVICE_UDEV_TIMEOUT 1400
|
|
||||||
|
|
||||||
#endif /* __CONTROLVMCOMPLETIONSTATUS_H__ not defined */
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
|
|
||||||
#include "channel.h"
|
#include "channel.h"
|
||||||
#include "controlvmchannel.h"
|
#include "controlvmchannel.h"
|
||||||
#include "controlvmcompletionstatus.h"
|
|
||||||
#include "guestlinuxdebug.h"
|
#include "guestlinuxdebug.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "visorbus.h"
|
#include "visorbus.h"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue