- Devel - libvirt List Archives

[libvirt] [PATCH] build: remove dead variables
by Eric Blake 01 Jul '11

01 Jul '11

Detected by Coverity. No real harm in leaving these, but fixing them cuts down on the noise for future analysis. * src/rpc/virnetserver.c (virNetServerAddService): Delete unused entry. * src/util/sysinfo.c (virSysinfoRead): Delete dead assignment to base. --- src/rpc/virnetserver.c | 7 +++---- src/util/sysinfo.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 0ef81fd..5e1719b 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -529,11 +529,10 @@ int virNetServerAddService(virNetServerPtr srv, #if HAVE_AVAHI if (mdnsEntryName) { int port = virNetServerServiceGetPort(svc); - virNetServerMDNSEntryPtr entry; - if (!(entry = virNetServerMDNSAddEntry(srv->mdnsGroup, - mdnsEntryName, - port))) + if (!virNetServerMDNSAddEntry(srv->mdnsGroup, + mdnsEntryName, + port)) goto error; } #endif diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index f4edde9..eec996b 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -472,7 +472,7 @@ virSysinfoRead(void) { ret->nmemory = 0; ret->memory = NULL; - if ((base = virSysinfoParseMemory(base, ret)) == NULL) + if (virSysinfoParseMemory(base, ret) == NULL) goto no_memory; cleanup: -- 1.7.4.4

2 2

[libvirt] [Libvirt-test-API][PATCH 1/6] add createWithFlags() API and modify migrate() function to align with libvirt Python migration definition
by Guannan.ren 01 Jul '11

01 Jul '11

--- lib/domainAPI.py | 57 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index 0c725f8..5667c20 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -40,18 +40,6 @@ append_path(result.group(0)) import exception -# DomainMigrateFlags -VIR_MIGRATE_LIVE = 1 - -# DomainState -VIR_DOMAIN_NOSTATE = 0 -VIR_DOMAIN_RUNNING = 1 -VIR_DOMAIN_BLOCKED = 2 -VIR_DOMAIN_PAUSED = 3 -VIR_DOMAIN_SHUTDOWN = 4 -VIR_DOMAIN_SHUTOFF = 5 -VIR_DOMAIN_CRASHED = 6 - class DomainAPI(object): def __init__(self, connection): self.conn = connection @@ -182,6 +170,16 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def start_with_flags(self, domname, flags = 0): + try: + dom_obj = self.get_defined_obj(domname) + retval = dom_obj.createWithFlags(flags) + return retval + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def suspend(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -223,10 +221,10 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def migrate(self, domname, dconn, flags = VIR_MIGRATE_LIVE): + def migrate(self, domname, dconn, flags, dname = None, uri = None, bandwidth = 0): try: dom_obj = self.get_domain_by_name(domname) - retval = dom_obj.migrate(dconn, flags, None, None, 0) + retval = dom_obj.migrate(dconn, flags, dname, uri, 0) return retval except libvirt.libvirtError, e: message = e.get_error_message() @@ -484,7 +482,7 @@ class DomainAPI(object): dom_obj = self.get_domain_by_name(domname) state = dom_obj.info() if state[0] == VIR_DOMAIN_NOSTATE: - dom_state = 'no state' + dom_state = 'nostate' elif state[0] == VIR_DOMAIN_RUNNING: dom_state = 'running' elif state[0] == VIR_DOMAIN_BLOCKED: @@ -581,7 +579,7 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def isActive(self, domname): + def is_active(self, domname): try: dom_obj = self.get_domain_by_name(domname) return dom_obj.isActive() @@ -590,7 +588,7 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def isPersistent(self, domname): + def is_persistent(self, domname): try: dom_obj = self.get_domain_by_name(domname) return dom_obj.isPersistent() @@ -662,10 +660,10 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def migrate_to_uri(self, domname, duri, dname, bandwidth, flag = 0): + def migrate_to_uri(self, domname, duri, flags, dname = None, bandwidth = 0): try: dom_obj = self.get_domain_by_name(domname) - return dom_obj.migrateToURI(duri, dname, bandwidth, flag) + return dom_obj.migrateToURI(duri, flags, dname, bandwidth) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -761,3 +759,24 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + +# DomainState +VIR_DOMAIN_NOSTATE = 0 +VIR_DOMAIN_RUNNING = 1 +VIR_DOMAIN_BLOCKED = 2 +VIR_DOMAIN_PAUSED = 3 +VIR_DOMAIN_SHUTDOWN = 4 +VIR_DOMAIN_SHUTOFF = 5 +VIR_DOMAIN_CRASHED = 6 + + +# virDomainMigrateFlags +VIR_MIGRATE_LIVE = 1 +VIR_MIGRATE_PEER2PEER = 2 +VIR_MIGRATE_TUNNELLED = 4 +VIR_MIGRATE_PERSIST_DEST = 8 +VIR_MIGRATE_UNDEFINE_SOURCE = 16 +VIR_MIGRATE_PAUSED = 32 +VIR_MIGRATE_NON_SHARED_DISK = 64 +VIR_MIGRATE_NON_SHARED_INC = 128 + -- 1.7.1

4 12

[libvirt] PPPoE-Server problem
by B Veera-B37207 01 Jul '11

01 Jul '11

HI, I am using Libvirt with LXC as hypervisor. When I am starting pppoe-server , unable to create ppp0 interface in Virtual machine, it is unable to serve ips to clients. Let me know is there any plug-in for this (Or) What is the solution. Regards, Veera.

1 0

[libvirt] [PATCH] Add test case for parsing JSON docs
by Daniel P. Berrange 01 Jul '11

01 Jul '11

While investigating some memory leaks it was unclear whether the JSON code correctly free'd all memory during parsing. Add a test case which can be run under valgrind to clearly demonstrate that the parser is leak free. * tests/Makefile.am: Add 'jsontest' * tests/jsontest.c: A few simple JSON parsing tests --- tests/Makefile.am | 14 +++++++ tests/jsontest.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 tests/jsontest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 7db9d1f..3bde22e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,6 +14,7 @@ INCLUDES = \ $(SASL_CFLAGS) \ $(SELINUX_CFLAGS) \ $(APPARMOR_CFLAGS) \ + $(YAJL_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(WARN_CFLAGS) @@ -29,6 +30,7 @@ LDADDS = \ $(SASL_LIBS) \ $(SELINUX_LIBS) \ $(APPARMOR_LIBS) \ + $(YAJL_LIBS) \ $(WARN_CFLAGS) \ ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ @@ -112,6 +114,10 @@ if WITH_CIL check_PROGRAMS += object-locking endif +if HAVE_YAJL +check_PROGRAMS += jsontest +endif + check_PROGRAMS += networkxml2xmltest check_PROGRAMS += networkxml2argvtest @@ -195,6 +201,10 @@ TESTS = virshtest \ virnetsockettest \ $(test_scripts) +if HAVE_YAJL +TESTS += jsontest +endif + if WITH_XEN TESTS += xml2sexprtest \ sexpr2xmltest \ @@ -443,6 +453,10 @@ hashtest_SOURCES = \ hashtest.c hashdata.h testutils.h testutils.c hashtest_LDADD = $(LDADDS) +jsontest_SOURCES = \ + jsontest.c jsondata.h testutils.h testutils.c +jsontest_LDADD = $(LDADDS) + if WITH_LIBVIRTD eventtest_SOURCES = \ eventtest.c testutils.h testutils.c diff --git a/tests/jsontest.c b/tests/jsontest.c new file mode 100644 index 0000000..412f475 --- /dev/null +++ b/tests/jsontest.c @@ -0,0 +1,111 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include "internal.h" +#include "json.h" +#include "testutils.h" + +struct testInfo { + const char *doc; + bool pass; +}; + + +static int +testJSONFromString(const void *data) +{ + const struct testInfo *info = data; + virJSONValuePtr json; + int ret = -1; + + json = virJSONValueFromString(info->doc); + + if (info->pass) { + if (!json) { + if (virTestGetVerbose()) + fprintf(stderr, "Fail to parse %s\n", info->doc); + ret = -1; + goto cleanup; + } else { + if (virTestGetDebug()) + fprintf(stderr, "Parsed %s\n", info->doc); + } + } else { + if (json) { + if (virTestGetVerbose()) + fprintf(stderr, "Should not have parsed %s\n", info->doc); + ret = -1; + goto cleanup; + } else { + if (virTestGetDebug()) + fprintf(stderr, "Fail to parse %s\n", info->doc); + } + } + + ret = 0; + +cleanup: + virJSONValueFree(json); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + +#define DO_TEST_FULL(name, cmd, doc, pass) \ + do { \ + struct testInfo info = { doc, pass }; \ + if (virtTestRun(name, 1, testJSON ## cmd, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST_PARSE(name, doc) \ + DO_TEST_FULL(name, FromString, doc, true) + + DO_TEST_PARSE("Simple", "{\"return\": {}, \"id\": \"libvirt-1\"}"); + DO_TEST_PARSE("NotSoSimple", "{\"QMP\": {\"version\": {\"qemu\":" + "{\"micro\": 91, \"minor\": 13, \"major\": 0}," + "\"package\": \" (qemu-kvm-devel)\"}, \"capabilities\": []}}"); + + + DO_TEST_PARSE("Harder", "{\"return\": [{\"filename\": " + "\"unix:/home/berrange/.libvirt/qemu/lib/tck.monitor,server\"," + "\"label\": \"charmonitor\"}, {\"filename\": \"pty:/dev/pts/158\"," + "\"label\": \"charserial0\"}], \"id\": \"libvirt-3\"}"); + + DO_TEST_PARSE("VeryHard", "{\"return\": [{\"name\": \"quit\"}, {\"name\":" + "\"eject\"}, {\"name\": \"change\"}, {\"name\": \"screendump\"}," + "{\"name\": \"stop\"}, {\"name\": \"cont\"}, {\"name\": " + "\"system_reset\"}, {\"name\": \"system_powerdown\"}, " + "{\"name\": \"device_add\"}, {\"name\": \"device_del\"}, " + "{\"name\": \"cpu\"}, {\"name\": \"memsave\"}, {\"name\": " + "\"pmemsave\"}, {\"name\": \"migrate\"}, {\"name\": " + "\"migrate_cancel\"}, {\"name\": \"migrate_set_speed\"}," + "{\"name\": \"client_migrate_info\"}, {\"name\": " + "\"migrate_set_downtime\"}, {\"name\": \"netdev_add\"}, " + "{\"name\": \"netdev_del\"}, {\"name\": \"block_resize\"}," + "{\"name\": \"balloon\"}, {\"name\": \"set_link\"}, {\"name\":" + "\"getfd\"}, {\"name\": \"closefd\"}, {\"name\": \"block_passwd\"}," + "{\"name\": \"set_password\"}, {\"name\": \"expire_password\"}," + "{\"name\": \"qmp_capabilities\"}, {\"name\": " + "\"human-monitor-command\"}, {\"name\": \"query-version\"}," + "{\"name\": \"query-commands\"}, {\"name\": \"query-chardev\"}," + "{\"name\": \"query-block\"}, {\"name\": \"query-blockstats\"}, " + "{\"name\": \"query-cpus\"}, {\"name\": \"query-pci\"}, {\"name\":" + "\"query-kvm\"}, {\"name\": \"query-status\"}, {\"name\": " + "\"query-mice\"}, {\"name\": \"query-vnc\"}, {\"name\": " + "\"query-spice\"}, {\"name\": \"query-name\"}, {\"name\": " + "\"query-uuid\"}, {\"name\": \"query-migrate\"}, {\"name\": " + "\"query-balloon\"}], \"id\": \"libvirt-2\"}"); + + return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.7.4.4

3 2

[libvirt] network filters not working at all in 0.9.2
by xxyton 01 Jul '11

01 Jul '11

Hi there, is just upgraded to libvirt 0.9.2 and restarted my domains but now all network filters are gone. Why does libvirt not set iptables configuration while filterref clause exists? Is this a known bug? How can I fix it. Restarting / redefining doesn't output any errors. Example config XML of domain: ... <filterref filter='clean-traffic'> <parameter name='IP' value='192.168.2.34'/> </filterref> ... # virsh -v 0.9.2 # iptables -L Chain INPUT (policy ACCEPT) target prot opt source destination ACCEPT udp -- anywhere anywhere udp dpt:domain ACCEPT tcp -- anywhere anywhere tcp dpt:domain ACCEPT udp -- anywhere anywhere udp dpt:bootps ACCEPT tcp -- anywhere anywhere tcp dpt:bootps Chain FORWARD (policy ACCEPT) target prot opt source destination ACCEPT all -- anywhere 192.168.122.0/24 state RELATED,ESTABLISHED ACCEPT all -- 192.168.122.0/24 anywhere ACCEPT all -- anywhere anywhere REJECT all -- anywhere anywhere reject-with icmp-port-unreachable REJECT all -- anywhere anywhere reject-with icmp-port-unreachable Chain OUTPUT (policy ACCEPT) target prot opt source destination

2 1

[libvirt] [PATCH] build: simplify sanlock distribution
by Eric Blake 30 Jun '11

30 Jun '11

EXTRA_DIST is intended for files that must unconditionally be part of the tarball, so it should be outside HAVE_SANLOCK. Once that is fixed, then there is no need to cp an unchanged qemu-sanlock.conf from srcdir to builddir in a VPATH build, not to mention that $(builddir) is not supported in the automake in use in RHEL 5. * src/Makefile.am ($(builddir)/locking/%-sanlock.conf): Delete. (BUILT_SOURCES): No need to build qemu-sanlock.conf. (EXTRA_DIST): Always ship sanlock .aug and .conf files. --- As promised in: https://www.redhat.com/archives/libvir-list/2011-June/msg01448.html I'm starting a 'make distcheck' overnight to fully test this, but think that it will pass without issues. src/Makefile.am | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8f99cc2..bfbaa06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1186,6 +1186,10 @@ libvirt_qemu_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) EXTRA_DIST += $(LIBVIRT_QEMU_SYMBOL_FILE) +EXTRA_DIST += locking/sanlock.conf \ + locking/libvirt_sanlock.aug \ + locking/test_libvirt_sanlock.aug + if HAVE_SANLOCK lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = sanlock.la @@ -1199,20 +1203,11 @@ sanlock_la_LIBADD = -lsanlock \ augeas_DATA += locking/libvirt_sanlock.aug augeastest_DATA += locking/test_libvirt_sanlock.aug -EXTRA_DIST += locking/sanlock.conf \ - locking/libvirt_sanlock.aug \ - locking/test_libvirt_sanlock.aug - -$(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf - $(AM_V_GEN)mkdir locking ; \ - cp $< $@ - if WITH_QEMU conf_DATA += locking/qemu-sanlock.conf -BUILT_SOURCES += locking/qemu-sanlock.conf endif else -EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) locking/sanlock.conf +EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) endif noinst_LTLIBRARIES += libvirt-net-rpc.la libvirt-net-rpc-server.la libvirt-net-rpc-client.la -- 1.7.4.4

4 6

[libvirt] [PATCH] build: allow 'make syntax-check' on fresh checkout
by Eric Blake 30 Jun '11

30 Jun '11

For good or for bad, I did a fresh checkout, ./autogen.sh, then 'configure', then 'make syntax-check', and was surprised that it failed. Running 'make' before 'make syntax-check' cleaned up the issue, but this patch makes it work up front. * cfg.mk (sc_po_check): Add prerequisite. --- I debated about pushing this one, but couldn't quite bring myself to call it a build-breaker. However, if it gets an ACK, I see no negative effects to pushing before 0.9.3. cfg.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cfg.mk b/cfg.mk index 69f35a3..fa9ea1c 100644 --- a/cfg.mk +++ b/cfg.mk @@ -605,6 +605,11 @@ _autogen: # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING +# sc_po_check can fail if generated files are not built first +sc_po_check: daemon/remote_dispatch.h +daemon/remote_dispatch.h: + $(MAKE) -C daemon remote_dispatch.h + # List all syntax-check exemptions: exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ -- 1.7.4.4

2 4

[libvirt] [PATCH] build: ignore generated file
by Eric Blake 30 Jun '11

30 Jun '11

* .gitignore: Exempt jsontest binary. --- Pushing under the trivial rule. .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index be4193d..1bfb7b9 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ /tests/*.log /tests/cputest /tests/hashtest +/tests/jsontest /tests/networkxml2argvtest /tests/nwfilterxml2xmltest /tests/openvzutilstest -- 1.7.4.4

1 0

[libvirt] [PATCH 0/4] several Coverity fixes
by Eric Blake 30 Jun '11

30 Jun '11

I ran Coverity on the state of yesterday's git; while I have not finished reading through all the findings, I figured I'd get some review started on these. Eric Blake (4): virsh: avoid integer overflow virsh: avoid uninitialized variable rpc: avoid freeing uninitialized variable build: avoid double-close bug with pipe2 .gnulib | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetsocket.c | 4 ++-- tools/virsh.c | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) -- 1.7.4.4

2 9

[libvirt] [PATCH] Add conditionals to allow build without SASL
by Daniel P. Berrange 30 Jun '11

30 Jun '11

* daemon/libvirtd.c, daemon/remote.c: Add #if HAVE_SASL and suitable function stubs to allow build without SASL --- daemon/libvirtd.c | 6 ++++++ daemon/remote.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 118aa92..60ee705 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -91,7 +91,9 @@ #include "configmake.h" +#if HAVE_SASL virNetSASLContextPtr saslCtxt = NULL; +#endif virNetServerProgramPtr remoteProgram = NULL; virNetServerProgramPtr qemuProgram = NULL; @@ -560,6 +562,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, } } +#if HAVE_SASL if (config->auth_unix_rw == REMOTE_AUTH_SASL || config->auth_unix_ro == REMOTE_AUTH_SASL || config->auth_tcp == REMOTE_AUTH_SASL || @@ -569,6 +572,7 @@ static int daemonSetupNetworking(virNetServerPtr srv, if (!saslCtxt) goto error; } +#endif #if HAVE_POLKIT0 if (auth_unix_rw == REMOTE_AUTH_POLKIT || @@ -745,8 +749,10 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons if (STREQ(p->str, "none")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_NONE; +#if HAVE_SASL } else if (STREQ(p->str, "sasl")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_SASL; +#endif } else if (STREQ(p->str, "polkit")) { *auth = VIR_NET_SERVER_SERVICE_AUTH_POLKIT; } else { diff --git a/daemon/remote.c b/daemon/remote.c index 9e6cf77..2889908 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1653,6 +1653,7 @@ cleanup: } +#ifdef HAVE_SASL /* * Initializes the SASL session in prepare for authentication * and gives the client a list of allowed mechanisms to choose @@ -1969,6 +1970,49 @@ error: virMutexUnlock(&priv->lock); return -1; } +#else +static int +remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +static int +remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, + remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +static int +remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client ATTRIBUTE_UNUSED, + virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, + remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) +{ + VIR_WARN("Client tried unsupported SASL auth"); + virNetError(VIR_ERR_AUTH_FAILED, "%s", + _("authentication failed")); + virNetMessageSaveError(rerr); + return -1; +} +#endif -- 1.7.4.4

4 3