kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

lsqeth: Use libvmcp and remove local vmcp code

Browse Source 
Use the new libvmcp.a to send commands to z/VM CP.
The error messages remain unchanged.

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Reviewed-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Thomas Richter
2018-02-22 14:37:27 +00:00
committed by Jan Höppner
parent eaa2ef6ba4
commit 9d55086720
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zconf/qeth/Makefile
View File

@@ -2,7 +2,7 @@ include ../../common.mak
all: lsqeth
libs = $(rootdir)/libutil/libutil.a
libs = $(rootdir)/libvmcp/libvmcp.a $(rootdir)/libutil/libutil.a
lsqeth: lsqeth.o misc.o $(libs)

50
zconf/qeth/lsqeth.c
View File

@@ -37,6 +37,7 @@
#include "lib/util_rec.h"
#include "lib/util_scandir.h"
#include "lib/zt_common.h"
#include "lib/vmcp.h"
#include "misc.h"
@@ -44,15 +45,6 @@
#define MAX_ID_LENGTH 10
#define PAGE_SIZE 4096
/*
* Constants for CP call (taken from vmcp.h)
*/
#define VMCP_DEVICE_NODE "/dev/vmcp"
#define VMCP_GETCODE _IOR(0x10, 1, int)
#define VMCP_SETBUF _IOW(0x10, 2, int)
#define VMCP_GETSIZE _IOR(0x10, 3, int)
#define CP_BUF_SIZE 8192
/*
* Private data
*/
@@ -197,32 +189,38 @@ static void ethtool_checksumming(char *buf, const char *if_name)
*/
static void exec_cp(char **argz, size_t *argz_len, const char *fmt, ...)
{
int fd, response_code, response_size, rc;
static const int buf_size = CP_BUF_SIZE;
char *buf, *command;
struct vmcp_parm cp;
char *command;
va_list ap;
int rc;
fd = open(VMCP_DEVICE_NODE, O_RDWR);
if (fd == -1)
errx(EXIT_FAILURE, "Could not open device %s", VMCP_DEVICE_NODE);
if (ioctl(fd, VMCP_SETBUF, &buf_size) == -1)
errx(EXIT_FAILURE, "Could not set buffer size");
UTIL_VASPRINTF(&command, fmt, ap);
if (write(fd, command, strlen(command)) == -1)
errx(EXIT_FAILURE, "Could not issue CP command");
cp.cpcmd = command;
cp.do_upper = false;
cp.buffer_size = VMCP_DEFAULT_BUFSZ;
rc = vmcp(&cp);
free(command);
if (ioctl(fd, VMCP_GETCODE, &response_code) == -1)
switch (rc) {
case VMCP_ERR_OPEN:
errx(EXIT_FAILURE, "Could not open device %s", VMCP_DEVICE_NODE);
case VMCP_ERR_SETBUF:
errx(EXIT_FAILURE, "Could not set buffer size");
case VMCP_ERR_GETCODE:
errx(EXIT_FAILURE, "Could not query return code");
if (ioctl(fd, VMCP_GETSIZE, &response_size) == -1)
case VMCP_ERR_GETSIZE:
errx(EXIT_FAILURE, "Could not query response size");
buf = util_malloc(buf_size);
rc = misc_read_buf(fd, buf, buf_size);
if (rc == -1)
case VMCP_ERR_WRITE:
errx(EXIT_FAILURE, "Could not issue CP command");
case VMCP_ERR_READ:
errx(EXIT_FAILURE, "Could not read CP response");
rc = argz_create_sep(buf, '\n', argz, argz_len);
case VMCP_ERR_TOOSMALL:
break; /* Truncated CP response treated as good */
}
rc = argz_create_sep(cp.response, '\n', argz, argz_len);
if (rc)
errx(EXIT_FAILURE, "Memory allocation error for CP response processing");
free(buf);
free(cp.response);
}
/*