External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/Makefile.am: add a tst target to ease building test progs

Browse Source 
* src/xend_internal.c: fix the reconnection problem to xend pointed
  by Philippe Berthault
* tests/Makefile.am tests/reconnect.c: add a specific test case
Daniel
This commit is contained in:
Daniel Veillard 2006-09-21 09:15:33 +00:00
parent 29182e995e
commit 546026a5be
5 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Sep 21 10:19:01 CEST 2006 Daniel Veillard <veillard@redhat.com>
* src/Makefile.am: add a tst target to ease building test progs
* src/xend_internal.c: fix the reconnection problem to xend pointed
by Philippe Berthault
* tests/Makefile.am tests/reconnect.c: add a specific test case
Tue Sep 19 16:59:53 CEST 2006 Daniel Veillard <veillard@redhat.com> Tue Sep 19 16:59:53 CEST 2006 Daniel Veillard <veillard@redhat.com>
* src/xen_internal.c: applied patch from Jim Fehlig, about * src/xen_internal.c: applied patch from Jim Fehlig, about

5
src/Makefile.am
View File

@ -35,3 +35,8 @@ virsh_LDFLAGS =
virsh_DEPENDENCIES = $(DEPS) virsh_DEPENDENCIES = $(DEPS)
virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
#
# target to ease building test programs
#
tst: tst.c
$(CC) $(CFLAGS) -I../include -o tst tst.c .libs/libvirt.a -lxml2 -lxenstore -lpthread

37
src/xend_internal.c
View File

@ -2421,7 +2421,10 @@ xenDaemonGetType(virConnectPtr conn)
int int
xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer) xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
{ {
static unsigned long version = 0; struct sexpr *root;
const char *extra;
int major, minor, release = 0;
unsigned long version;
if (!VIR_IS_CONNECT(conn)) { if (!VIR_IS_CONNECT(conn)) {
virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); virXendError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__);
@ -2431,28 +2434,22 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); virXendError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__);
return (-1); return (-1);
} }
if (version == 0) { root = sexpr_get(conn, "/xend/node/");
struct sexpr *root; if (root == NULL)
const char *extra; return(-1);
int major, minor, release = 0;
root = sexpr_get(conn, "/xend/node/"); major = sexpr_int(root, "node/xen_major");
if (root == NULL) minor = sexpr_int(root, "node/xen_minor");
return(-1); extra = sexpr_node(root, "node/xen_extra");
if (extra != NULL) {
major = sexpr_int(root, "node/xen_major"); while (*extra != 0) {
minor = sexpr_int(root, "node/xen_minor"); if ((*extra >= '0') && (*extra <= '9'))
extra = sexpr_node(root, "node/xen_extra"); release = release * 10 + (*extra - '0');
if (extra != NULL) { extra++;
while (*extra != 0) {
if ((*extra >= '0') && (*extra <= '9'))
release = release * 10 + (*extra - '0');
extra++;
}
} }
sexpr_free(root);
version = major * 1000000 + minor * 1000 + release;
} }
sexpr_free(root);
version = major * 1000000 + minor * 1000 + release;
*hvVer = version; *hvVer = version;
return(0); return(0);
} }

10
tests/Makefile.am
View File

@ -19,9 +19,10 @@ LDADDS = \
EXTRA_DIST = xmlrpcserver.py test_conf.sh EXTRA_DIST = xmlrpcserver.py test_conf.sh
noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \
reconnect
TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh TESTS = xml2sexprtest sexpr2xmltest virshtest test_conf.sh reconnect
valgrind: valgrind:
$(MAKE) check TESTS_ENVIRONMENT="valgrind --quiet" $(MAKE) check TESTS_ENVIRONMENT="valgrind --quiet"
@ -59,5 +60,10 @@ conftest_SOURCES = \
conftest_LDFLAGS = conftest_LDFLAGS =
conftest_LDADD = $(LDADDS) conftest_LDADD = $(LDADDS)
reconnect_SOURCES = \
reconnect.c
reconnect_LDFLAGS =
reconnect_LDADD = $(LDADDS)
$(LIBVIRT): $(LIBVIRT):
-@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent) -@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent)

38
tests/reconnect.c Normal file
View File

@ -0,0 +1,38 @@
#include <stdio.h>
#include <stdlib.h>
#include <libvirt/libvirt.h>
int main(void) {
int id = 0;
virConnectPtr conn;
virDomainPtr dom;
conn = virConnectOpen("");
if (conn == NULL) {
fprintf(stderr, "First virConnectOpen() failed\n");
exit(1);
}
dom = virDomainLookupByID(conn, id);
if (dom == NULL) {
fprintf(stderr, "First lookup for domain %d failed\n", id);
exit(1);
}
virDomainFree(dom);
virConnectClose(conn);
conn = virConnectOpen("");
if (conn == NULL) {
fprintf(stderr, "Second virConnectOpen() failed\n");
exit(1);
}
dom = virDomainLookupByID(conn, id);
if (dom == NULL) {
fprintf(stderr, "Second lookup for domain %d failed\n", id);
exit(1);
}
virDomainFree(dom);
virConnectClose(conn);
printf("OK\n");
exit(0);
}