2008-01-29 18:15:54 +00:00
# include <config.h>
2007-11-26 12:03:34 +00:00
2006-08-24 15:05:19 +00:00
# include <stdio.h>
# include <string.h>
2008-04-26 14:22:02 +00:00
# include <unistd.h>
2006-08-24 15:05:19 +00:00
Wed Dec 5 13:48:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* python/libvir.c, python/libvirt_wrap.h, qemud/qemud.c,
qemud/remote.c, src/internal.h, src/openvz_conf.c,
src/openvz_driver.c, src/proxy_internal.h, src/qemu_conf.c,
src/qemu_driver.c, src/remote_internal.h, src/test.h, src/util.c,
src/xen_unified.c, src/xen_unified.h, tests/nodeinfotest.c,
tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c, tests/reconnect.c,
tests/sexpr2xmltest.c, tests/virshtest.c, tests/xencapstest.c,
tests/xmconfigtest.c, tests/xml2sexprtest.c:
Change #include <> to #include "" for local includes.
Removed many includes from src/internal.h and put them in
the C files which actually use them.
Removed <ansidecl.h> - unused.
Added a comment around __func__.
Removed a clashing redefinition of VERSION symbol.
All limits (PATH_MAX etc) now done in src/internal.h, so we
don't need to include those headers in other files.
2007-12-05 13:56:22 +00:00
# include "internal.h"
2006-08-24 15:05:19 +00:00
# include "xml.h"
2009-01-22 18:19:20 +00:00
# include "datatypes.h"
Move xen driver code into src/xen/ directory
* src/Makefile.am, src/proxy_internal.c, src/proxy_internal.h
src/sexpr.c, src/sexpr.h, src/xen_unified.c, src/xen_unified.h,
src/xen_internal.c, src/xen_internal.h, src/xen_inotify.c,
src/xen_inotify.h, src/xend_internal.c, src/xend_internal.h,
src/xm_internal.c, src/xm_internal.h, src/xs_internal.c,
src/xs_internal.h: Move to src/xen/ directory
* proxy/Makefile.am, proxy/libvirt_proxy.c, src/Makefile.am,
src/libvirt.c, tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c, tests/xml2sexprtest.c:
Adapt to changed xen location
* src/stats_linux.h, src/stats_linux.c: Remove xen specific block
stats APIs
* src/qemu_driver.c, src/uml_driver.c: Add missing sys/un.h include
uncovered after change to stats_linux.h
* src/xen/block_stats.h, src/xen/block_stats.c: Add xen specific
block stats APIs
2009-09-15 16:38:33 +01:00
# include "xen/xen_driver.h"
# include "xen/xend_internal.h"
2006-08-24 15:05:19 +00:00
# include "testutils.h"
2009-01-22 18:19:20 +00:00
# include "testutilsxen.h"
2006-08-24 15:05:19 +00:00
static char * progname ;
2008-04-26 14:22:02 +00:00
static char * abs_srcdir ;
2009-01-22 18:19:20 +00:00
static virCapsPtr caps ;
2006-08-24 15:05:19 +00:00
# define MAX_FILE 4096
2008-04-26 14:22:02 +00:00
static int testCompareFiles ( const char * xml , const char * sexpr ,
2007-11-14 10:35:58 +00:00
int xendConfigVersion ) {
2006-08-24 15:05:19 +00:00
char xmlData [ MAX_FILE ] ;
char sexprData [ MAX_FILE ] ;
char * gotxml = NULL ;
char * xmlPtr = & ( xmlData [ 0 ] ) ;
char * sexprPtr = & ( sexprData [ 0 ] ) ;
2006-10-06 15:32:48 +00:00
int ret = - 1 ;
2008-07-25 10:49:33 +00:00
virDomainDefPtr def = NULL ;
2009-01-22 18:19:20 +00:00
virConnectPtr conn ;
struct _xenUnifiedPrivate priv ;
conn = virGetConnect ( ) ;
if ( ! conn ) goto fail ;
2007-11-14 10:35:58 +00:00
2008-07-25 10:49:33 +00:00
if ( virtTestLoadFile ( xml , & xmlPtr , MAX_FILE ) < 0 )
2008-04-26 14:22:02 +00:00
goto fail ;
2006-08-24 15:05:19 +00:00
2008-07-25 10:49:33 +00:00
if ( virtTestLoadFile ( sexpr , & sexprPtr , MAX_FILE ) < 0 )
goto fail ;
2009-01-22 18:19:20 +00:00
memset ( & priv , 0 , sizeof priv ) ;
/* Many puppies died to bring you this code. */
priv . xendConfigVersion = xendConfigVersion ;
priv . caps = caps ;
conn - > privateData = & priv ;
if ( virMutexInit ( & priv . lock ) < 0 )
goto fail ;
if ( ! ( def = xenDaemonParseSxprString ( conn , sexprData , xendConfigVersion ) ) )
2008-04-26 14:22:02 +00:00
goto fail ;
2006-08-24 15:05:19 +00:00
2010-02-09 18:58:01 +00:00
if ( ! ( gotxml = virDomainDefFormat ( def , 0 ) ) )
2008-07-25 10:49:33 +00:00
goto fail ;
2006-08-24 15:05:19 +00:00
2008-04-26 14:22:02 +00:00
if ( STRNEQ ( xmlData , gotxml ) ) {
virtTestDifference ( stderr , xmlData , gotxml ) ;
goto fail ;
2007-07-16 21:30:30 +00:00
}
2006-08-24 15:05:19 +00:00
2006-10-06 15:32:48 +00:00
ret = 0 ;
fail :
free ( gotxml ) ;
2008-07-25 10:49:33 +00:00
virDomainDefFree ( def ) ;
2009-04-01 10:31:01 +00:00
if ( conn )
virUnrefConnect ( conn ) ;
2006-10-06 15:32:48 +00:00
return ret ;
2006-08-24 15:05:19 +00:00
}
2008-04-26 14:22:02 +00:00
struct testInfo {
const char * input ;
const char * output ;
int version ;
} ;
2007-07-18 21:08:22 +00:00
2008-04-26 14:22:02 +00:00
static int testCompareHelper ( const void * data ) {
const struct testInfo * info = data ;
char xml [ PATH_MAX ] ;
char args [ PATH_MAX ] ;
snprintf ( xml , PATH_MAX , " %s/sexpr2xmldata/sexpr2xml-%s.xml " ,
abs_srcdir , info - > input ) ;
snprintf ( args , PATH_MAX , " %s/sexpr2xmldata/sexpr2xml-%s.sexpr " ,
abs_srcdir , info - > output ) ;
return testCompareFiles ( xml , args , info - > version ) ;
2008-02-05 16:21:25 +00:00
}
2007-07-16 21:30:30 +00:00
2008-05-29 15:31:49 +00:00
static int
mymain ( int argc , char * * argv )
2006-08-24 15:05:19 +00:00
{
int ret = 0 ;
2008-04-26 14:22:02 +00:00
char cwd [ PATH_MAX ] ;
2006-10-09 14:32:07 +00:00
2006-08-24 15:05:19 +00:00
progname = argv [ 0 ] ;
2006-10-09 14:32:07 +00:00
2006-08-24 15:05:19 +00:00
if ( argc > 1 ) {
2008-04-10 16:54:54 +00:00
fprintf ( stderr , " Usage: %s \n " , progname ) ;
2008-05-29 15:31:49 +00:00
return ( EXIT_FAILURE ) ;
2006-08-24 15:05:19 +00:00
}
2006-10-09 14:32:07 +00:00
2008-04-26 14:22:02 +00:00
abs_srcdir = getenv ( " abs_srcdir " ) ;
if ( ! abs_srcdir )
abs_srcdir = getcwd ( cwd , sizeof ( cwd ) ) ;
if ( argc > 1 ) {
fprintf ( stderr , " Usage: %s \n " , progname ) ;
2008-05-29 15:31:49 +00:00
return ( EXIT_FAILURE ) ;
2007-11-20 10:05:45 +00:00
}
2007-11-14 10:35:58 +00:00
2009-01-22 18:19:20 +00:00
if ( ! ( caps = testXenCapsInit ( ) ) )
return ( EXIT_FAILURE ) ;
2008-04-26 14:22:02 +00:00
# define DO_TEST(in, out, version) \
do { \
struct testInfo info = { in , out , version } ; \
2009-04-01 10:31:01 +00:00
virResetLastError ( ) ; \
2008-04-26 14:22:02 +00:00
if ( virtTestRun ( " Xen SEXPR-2-XML " in " -> " out , \
1 , testCompareHelper , & info ) < 0 ) \
ret = - 1 ; \
} while ( 0 )
DO_TEST ( " pv " , " pv " , 1 ) ;
DO_TEST ( " fv " , " fv " , 1 ) ;
DO_TEST ( " pv " , " pv " , 2 ) ;
DO_TEST ( " fv-v2 " , " fv-v2 " , 2 ) ;
DO_TEST ( " pv-vfb-orig " , " pv-vfb-orig " , 2 ) ;
DO_TEST ( " pv-vfb-new " , " pv-vfb-new " , 3 ) ;
2008-09-09 13:53:58 +00:00
DO_TEST ( " pv-vfb-new-vncdisplay " , " pv-vfb-new-vncdisplay " , 3 ) ;
2009-08-18 22:10:41 +01:00
DO_TEST ( " pv-vfb-type-crash " , " pv-vfb-type-crash " , 3 ) ;
2009-01-29 17:02:00 +00:00
DO_TEST ( " fv-autoport " , " fv-autoport " , 3 ) ;
2008-04-26 14:22:02 +00:00
DO_TEST ( " pv-bootloader " , " pv-bootloader " , 1 ) ;
2010-10-05 08:18:52 -06:00
DO_TEST ( " pv-vcpus " , " pv-vcpus " , 1 ) ;
2008-04-26 14:22:02 +00:00
DO_TEST ( " disk-file " , " disk-file " , 2 ) ;
DO_TEST ( " disk-block " , " disk-block " , 2 ) ;
DO_TEST ( " disk-block-shareable " , " disk-block-shareable " , 2 ) ;
DO_TEST ( " disk-drv-blktap-raw " , " disk-drv-blktap-raw " , 2 ) ;
DO_TEST ( " disk-drv-blktap-qcow " , " disk-drv-blktap-qcow " , 2 ) ;
2010-08-24 15:49:00 -06:00
DO_TEST ( " disk-drv-blktap2-raw " , " disk-drv-blktap2-raw " , 2 ) ;
2008-04-26 14:22:02 +00:00
2008-05-08 14:41:56 +00:00
DO_TEST ( " curmem " , " curmem " , 2 ) ;
2008-04-26 14:22:02 +00:00
DO_TEST ( " net-routed " , " net-routed " , 2 ) ;
DO_TEST ( " net-bridged " , " net-bridged " , 2 ) ;
2008-04-30 12:30:55 +00:00
DO_TEST ( " net-e1000 " , " net-e1000 " , 2 ) ;
2009-01-23 01:48:47 +00:00
DO_TEST ( " bridge-ipaddr " , " bridge-ipaddr " , 3 ) ;
2008-05-08 14:41:56 +00:00
DO_TEST ( " no-source-cdrom " , " no-source-cdrom " , 2 ) ;
2009-04-01 10:36:52 +00:00
DO_TEST ( " pv-localtime " , " pv-localtime " , 2 ) ;
2009-04-03 12:38:52 +00:00
DO_TEST ( " pci-devs " , " pci-devs " , 2 ) ;
2008-04-26 14:22:02 +00:00
DO_TEST ( " fv-utc " , " fv-utc " , 1 ) ;
DO_TEST ( " fv-localtime " , " fv-localtime " , 1 ) ;
DO_TEST ( " fv-usbmouse " , " fv-usbmouse " , 1 ) ;
2008-07-25 10:49:33 +00:00
DO_TEST ( " fv-usbtablet " , " fv-usbtablet " , 1 ) ;
2008-04-26 14:22:02 +00:00
DO_TEST ( " fv-kernel " , " fv-kernel " , 1 ) ;
DO_TEST ( " fv-serial-null " , " fv-serial-null " , 1 ) ;
DO_TEST ( " fv-serial-file " , " fv-serial-file " , 1 ) ;
DO_TEST ( " fv-serial-stdio " , " fv-serial-stdio " , 1 ) ;
DO_TEST ( " fv-serial-pty " , " fv-serial-pty " , 1 ) ;
DO_TEST ( " fv-serial-pipe " , " fv-serial-pipe " , 1 ) ;
DO_TEST ( " fv-serial-tcp " , " fv-serial-tcp " , 1 ) ;
DO_TEST ( " fv-serial-udp " , " fv-serial-udp " , 1 ) ;
DO_TEST ( " fv-serial-tcp-telnet " , " fv-serial-tcp-telnet " , 1 ) ;
DO_TEST ( " fv-serial-unix " , " fv-serial-unix " , 1 ) ;
DO_TEST ( " fv-parallel-tcp " , " fv-parallel-tcp " , 1 ) ;
2008-02-05 16:21:25 +00:00
2008-05-07 14:04:40 +00:00
DO_TEST ( " fv-sound " , " fv-sound " , 1 ) ;
DO_TEST ( " fv-sound-all " , " fv-sound-all " , 1 ) ;
2009-12-04 17:01:34 +01:00
DO_TEST ( " fv-net-ioemu " , " fv-net-ioemu " , 1 ) ;
DO_TEST ( " fv-net-netfront " , " fv-net-netfront " , 1 ) ;
2010-08-23 14:00:22 +01:00
DO_TEST ( " boot-grub " , " boot-grub " , 1 ) ;
2009-04-01 10:31:01 +00:00
virCapabilitiesFree ( caps ) ;
2008-05-29 15:31:49 +00:00
return ( ret = = 0 ? EXIT_SUCCESS : EXIT_FAILURE ) ;
2006-08-24 15:05:19 +00:00
}
2008-05-29 15:31:49 +00:00
VIRT_TEST_MAIN ( mymain )