mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
ccoffing@novell.com[iap10]
e4c215974f
[PATCH] stream fixes for migration I've attached a patch for libxutil/libxc. This fixes one of the hangs = I've seen during migrations. It applies against 2.0 and 2.0-testing. Changes: * Encountering EOF or error when xfrd reads from stream could cause an = infinite loop. * Cleaned up the closing of streams. * Fixed several memory leaks. Signed-off-by: Charles Coffing <ccoffing@novell.com>
72 lines
1.6 KiB
C
72 lines
1.6 KiB
C
#ifndef __XC_XC_IO_H__
|
|
#define __XC_XC_IO_H__
|
|
|
|
#include <errno.h>
|
|
#include "xc_private.h"
|
|
#include "iostream.h"
|
|
|
|
typedef struct XcIOContext {
|
|
u32 domain;
|
|
unsigned flags;
|
|
int resource;
|
|
IOStream *io;
|
|
IOStream *info;
|
|
IOStream *err;
|
|
char *vmconfig;
|
|
int vmconfig_n;
|
|
int (*suspend)(void *data, u32 domain);
|
|
int (*configure)(void *data, u32 domain, char *vmconfig, int vmconfig_n);
|
|
void *data;
|
|
} XcIOContext;
|
|
|
|
static inline int xcio_suspend_domain(XcIOContext *ctxt){
|
|
int err = 0;
|
|
|
|
if(ctxt->suspend){
|
|
err = ctxt->suspend(ctxt->data, ctxt->domain);
|
|
} else {
|
|
err = -EINVAL;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
static inline int xcio_configure_domain(XcIOContext *ctxt){
|
|
int err = 0;
|
|
|
|
if(ctxt->configure){
|
|
err = ctxt->configure(ctxt->data, ctxt->domain, ctxt->vmconfig, ctxt->vmconfig_n);
|
|
} else {
|
|
err = -EINVAL;
|
|
}
|
|
return err;
|
|
}
|
|
|
|
static inline int xcio_read(XcIOContext *ctxt, void *buf, int n){
|
|
int rc;
|
|
|
|
rc = IOStream_read(ctxt->io, buf, n);
|
|
return (rc == n ? 0 : -1);
|
|
}
|
|
|
|
static inline int xcio_write(XcIOContext *ctxt, void *buf, int n){
|
|
int rc;
|
|
|
|
rc = IOStream_write(ctxt->io, buf, n);
|
|
return (rc == n ? 0 : -1);
|
|
}
|
|
|
|
static inline int xcio_flush(XcIOContext *ctxt){
|
|
return IOStream_flush(ctxt->io);
|
|
}
|
|
|
|
extern void xcio_error(XcIOContext *ctxt, const char *msg, ...);
|
|
extern void xcio_info(XcIOContext *ctxt, const char *msg, ...);
|
|
|
|
#define xcio_perror(_ctxt, _msg...) \
|
|
xcio_error(_ctxt, "(errno %d %s)" _msg, errno, strerror(errno), ## _msg)
|
|
|
|
#endif /* ! __XC_XC_IO_H__ */
|
|
|
|
|
|
|