- Devel - libvirt List Archives

[libvirt] [PATCHv3 00/10] outgoing migration via fd: rather than exec:
by Eric Blake 04 Mar '11

04 Mar '11

Still not quite complete (I need to hook up compression to benefit from fd:), but in much better shape (this series could be applied as-is, if it receives ACKs, and I can do the compression improvements separately). Changes in v3: add lots of intermediate patches, to make fd passing much easier. Eric Blake (10): qemu: use lighter-weight fd:n on incoming tunneled migration qemu: support migration to fd util: use SCM_RIGHTS in virFileOperation when needed qemu: allow simple domain save to use fd: protocol qemu: simplify domain save fd handling storage: simplify fd handling util: rename virFileOperation to virFileOpenAs util: adjust indentation in previous patch qemu, storage: improve type safety qemu: improve efficiency of dd during snapshots src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 105 ++++++++++++++------------- src/qemu/qemu_migration.c | 45 ++++-------- src/qemu/qemu_monitor.c | 22 ++++++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 24 ++++++- src/qemu/qemu_monitor_json.h | 6 ++- src/qemu/qemu_monitor_text.c | 27 ++++++- src/qemu/qemu_monitor_text.h | 6 ++- src/storage/storage_backend.c | 77 ++++++++++---------- src/util/util.c | 161 ++++++++++++++++++++++++++++------------- src/util/util.h | 15 ++-- 12 files changed, 310 insertions(+), 184 deletions(-) -- 1.7.4

2 16

[libvirt] [PATCH 1/2] virsh: Change integer option parsing functions to return tri-state information.
by Michal Privoznik 04 Mar '11

04 Mar '11

This is needed to detect situations when optional argument was specified with non-integer value: '--int-opt foo'. --- tools/virsh.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 62fca17..e5093a2 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -252,13 +252,14 @@ static const vshCmdGrp *vshCmdGrpSearch(const char *grpname); static int vshCmdGrpHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); -static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); +static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found, + int *opt_found); static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, - int *found); + int *found, int *opt_found); static char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, - int *found); + int *found, int *opt_found); static int vshCommandOptBool(const vshCmd *cmd, const char *name); static char *vshCommandOptArgv(const vshCmd *cmd, int count); @@ -1602,7 +1603,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, param->type == VIR_DOMAIN_SCHED_FIELD_UINT && vshCommandOptBool(cmd, "weight")) { int val; - val = vshCommandOptInt(cmd, "weight", &found); + val = vshCommandOptInt(cmd, "weight", &found, NULL); if (!found) { vshError(ctl, "%s", _("Invalid value of weight")); return -1; @@ -1617,7 +1618,7 @@ cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, param->type == VIR_DOMAIN_SCHED_FIELD_UINT && vshCommandOptBool(cmd, "cap")) { int val; - val = vshCommandOptInt(cmd, "cap", &found); + val = vshCommandOptInt(cmd, "cap", &found, NULL); if (!found) { vshError(ctl, "%s", _("Invalid value of cap")); return -1; @@ -2300,7 +2301,7 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; - cell = vshCommandOptInt(cmd, "cellno", &cell_given); + cell = vshCommandOptInt(cmd, "cellno", &cell_given, NULL); all_given = vshCommandOptBool(cmd, "all"); if (all_given && cell_given) { @@ -2726,7 +2727,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound); + vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound, NULL); if (!vcpufound) { vshError(ctl, "%s", _("vcpupin: Invalid or missing vCPU number.")); virDomainFree(dom); @@ -2862,7 +2863,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - count = vshCommandOptInt(cmd, "count", &count); + count = vshCommandOptInt(cmd, "count", &count, NULL); if (!flags) { if (virDomainSetVcpus(dom, count) != 0) { @@ -2927,7 +2928,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptUL(cmd, "kilobytes", NULL); + kilobytes = vshCommandOptUL(cmd, "kilobytes", NULL, NULL); if (kilobytes <= 0) { virDomainFree(dom); vshError(ctl, _("Invalid value of %lu for memory size"), kilobytes); @@ -2984,7 +2985,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); + kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes, NULL); if (kilobytes <= 0) { virDomainFree(dom); vshError(ctl, _("Invalid value of %d for memory size"), kilobytes); @@ -3056,22 +3057,22 @@ cmdMemtune(vshControl * ctl, const vshCmd * cmd) return FALSE; hard_limit = - vshCommandOptLongLong(cmd, "hard-limit", NULL); + vshCommandOptLongLong(cmd, "hard-limit", NULL, NULL); if (hard_limit) nparams++; soft_limit = - vshCommandOptLongLong(cmd, "soft-limit", NULL); + vshCommandOptLongLong(cmd, "soft-limit", NULL, NULL); if (soft_limit) nparams++; swap_hard_limit = - vshCommandOptLongLong(cmd, "swap-hard-limit", NULL); + vshCommandOptLongLong(cmd, "swap-hard-limit", NULL, NULL); if (swap_hard_limit) nparams++; min_guarantee = - vshCommandOptLongLong(cmd, "min-guarantee", NULL); + vshCommandOptLongLong(cmd, "min-guarantee", NULL, NULL); if (min_guarantee) nparams++; @@ -3670,7 +3671,7 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool (cmd, "live")) live_flag = TRUE; - timeout = vshCommandOptInt(cmd, "timeout", &found); + timeout = vshCommandOptInt(cmd, "timeout", &found, NULL); if (found) { if (! live_flag) { vshError(ctl, "%s", _("migrate: Unexpected timeout for offline migration")); @@ -3807,7 +3808,7 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - downtime = vshCommandOptLongLong(cmd, "downtime", &found); + downtime = vshCommandOptLongLong(cmd, "downtime", &found, NULL); if (!found || downtime < 1) { vshError(ctl, "%s", _("migrate: Invalid downtime")); goto done; @@ -10796,7 +10797,7 @@ vshCommandOpt(const vshCmd *cmd, const char *name) * Returns option as INT */ static int -vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) +vshCommandOptInt(const vshCmd *cmd, const char *name, int *found, int *opt_found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); int res = 0, num_found = FALSE; @@ -10811,11 +10812,13 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) } if (found) *found = num_found; + if (opt_found) + *opt_found = arg ? TRUE : FALSE; return res; } static unsigned long -vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) +vshCommandOptUL(const vshCmd *cmd, const char *name, int *found, int *opt_found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); unsigned long res = 0; @@ -10831,6 +10834,8 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) } if (found) *found = num_found; + if (opt_found) + *opt_found = arg ? TRUE : FALSE; return res; } @@ -10858,7 +10863,8 @@ vshCommandOptString(const vshCmd *cmd, const char *name, int *found) * Returns option as long long */ static long long -vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found) +vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found, + int *opt_found) { vshCmdOpt *arg = vshCommandOpt(cmd, name); int num_found = FALSE; @@ -10869,6 +10875,8 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, int *found) num_found = !virStrToLong_ll(arg->data, &end_p, 10, &res); if (found) *found = num_found; + if (opt_found) + *opt_found = arg ? TRUE : FALSE; return res; } -- 1.7.4

2 2

[libvirt] Fixes for several memory leaks
by Phil Petty (phpetty) 04 Mar '11

04 Mar '11

Index: libvirt/src/conf/secret_conf.c =================================================================== *************** *** 154,160 **** _("invalid value of 'private'")); goto cleanup; } - VIR_FREE(prop); } uuidstr = virXPathString("string(./uuid)", ctxt); --- 154,159 ---- *************** *** 170,176 **** "%s", _("malformed uuid element")); goto cleanup; } - VIR_FREE(uuidstr); } def->description = virXPathString("string(./description)", ctxt); --- 169,174 ---- *************** *** 181,187 **** def = NULL; cleanup: ! VIR_FREE(prop); virSecretDefFree(def); xmlXPathFreeContext(ctxt); return ret; --- 179,190 ---- def = NULL; cleanup: ! if (prop) { ! VIR_FREE(prop); ! } ! if (uuidstr) { ! VIR_FREE(uuidstr); ! } virSecretDefFree(def); xmlXPathFreeContext(ctxt); return ret; Index: libvirt/src/nwfilter/nwfilter_gentech_driver.c =================================================================== *************** *** 662,673 **** } virNWFilterUnlockIface(ifname); - - VIR_FREE(ptrs); } err_exit: virNWFilterUnlockFilterUpdates(); for (j = 0; j < nEntries; j++) --- 662,675 ---- } virNWFilterUnlockIface(ifname); } err_exit: + if (ptrs) { + VIR_FREE(ptrs); + } + virNWFilterUnlockFilterUpdates(); for (j = 0; j < nEntries; j++) Index: libvirt/src/remote/remote_driver.c =================================================================== *************** *** 474,495 **** --- 474,510 ---- for (i = 0; i < vars->n; i++) { var = &vars->p[i]; if (STRCASEEQ (var->name, "name")) { + if (name) { + VIR_FREE(name); + } name = strdup (var->value); if (!name) goto out_of_memory; var->ignore = 1; } else if (STRCASEEQ (var->name, "command")) { + if (command) { + VIR_FREE(command); + } command = strdup (var->value); if (!command) goto out_of_memory; var->ignore = 1; } else if (STRCASEEQ (var->name, "socket")) { + if (sockname) { + VIR_FREE(sockname); + } sockname = strdup (var->value); if (!sockname) goto out_of_memory; var->ignore = 1; } else if (STRCASEEQ (var->name, "auth")) { + if (authtype) { + VIR_FREE(authtype); + } authtype = strdup (var->value); if (!authtype) goto out_of_memory; var->ignore = 1; } else if (STRCASEEQ (var->name, "netcat")) { + if (netcat) { + VIR_FREE(netcat); + } netcat = strdup (var->value); if (!netcat) goto out_of_memory; var->ignore = 1; Index: libvirt/src/util/conf.c =================================================================== *************** *** 651,656 **** --- 651,657 ---- SKIP_BLANKS; if (CUR != '=') { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting an assignment")); + VIR_FREE(name); return(-1); } NEXT; Index: libvirt/src/util/storage_file.c =================================================================== *************** *** 742,747 **** --- 742,748 ---- if (format < 0 || format >= VIR_STORAGE_FILE_LAST) { virReportSystemError(EINVAL, _("unknown storage file format %d"), format); + VIR_FREE(head); return -1; } Index: libvirt/src/util/xml.c =================================================================== *************** *** 107,113 **** virXMLError(VIR_ERR_INTERNAL_ERROR, _("\'%s\' value longer than %Zd bytes in virXPathStringLimit()"), xpath, maxlen); ! return NULL; } return tmp; --- 107,114 ---- virXMLError(VIR_ERR_INTERNAL_ERROR, _("\'%s\' value longer than %Zd bytes in virXPathStringLimit()"), xpath, maxlen); ! VIR_FREE(tmp); ! return NULL; } return tmp; Index: libvirt/tools/virsh.c =================================================================== *************** *** 8697,8702 **** --- 8697,8703 ---- { const char *dir; int found; + int dir_root = FALSE; if (!ctl->imode) { vshError(ctl, "%s", _("cd: command valid only in interactive mode")); *************** *** 8708,8721 **** uid_t uid = geteuid(); dir = virGetUserDirectory(uid); } ! if (!dir) dir = "/"; if (chdir (dir) == -1) { vshError(ctl, _("cd: %s: %s"), strerror(errno), dir); return FALSE; } return TRUE; } --- 8709,8730 ---- uid_t uid = geteuid(); dir = virGetUserDirectory(uid); } ! if (!dir) { dir = "/"; + dir_root = TRUE; + } if (chdir (dir) == -1) { vshError(ctl, _("cd: %s: %s"), strerror(errno), dir); + if (!dir_root) { + VIR_FREE(dir); + } return FALSE; } + if (!dir_root) { + VIR_FREE(dir); + } return TRUE; } Kind regards, Phil Petty

2 1

[libvirt] Network Filter not working on RHEL-6
by Shi Jin 04 Mar '11

04 Mar '11

Hi there, I have been testing the Network Filter [1] feature of libvirt with KVM on RHEL-5.6 and RHEL-6. On RHEL-5.6, it works well except the $IP variable is not supported thus cannot use the clean-filter. The major problem I found on RHEL-6 is that the iptables rules introduced by nwfilter does not prevent any traffic. The problem is that all traffic going to the VM virtual NIC interface goes through the INPUT chain of the iptables instead of the supposed-to-be FORWARD chain (this is what the nwfilter rules are working on) so that none of the rules have any effect. I am not sure whether this is a libvirt problem or iptables problem. But it seems to me that changing from RHEL-5.6 to RHEL-6, the network traffic works differently. Has anyone had similar experience? Any suggestion or comments are welcome. Thank you very much. Shi [1] http://libvirt.org/formatnwfilter.html -- Shi Jin, PhD

4 5

[libvirt] [PATCH] qemu: Support vram for video of qxl type
by Osier Yang 04 Mar '11

04 Mar '11

For qemu names the primary vga as "qxl-vga": 1) if vram is specified for 2nd qxl device: -vga qxl -global qxl-vga.vram_size=$SIZE \ -device qxl,id=video1,vram_size=$SIZE,... 2) if vram is not specified for 2nd qxl device, (use the default set by global): -vga qxl -global qxl-vga.vram_size=$SIZE \ -device qxl,id=video1,... For qemu names all qxl devices as "qxl": 1) if vram is specified for 2nd qxl device: -vga qxl -global qxl.vram_size=$SIZE \ -device qxl,id=video1,vram_size=$SIZE ... 2) if vram is not specified for 2nd qxl device: -vga qxl -global qxl-vga.vram_size=$SIZE \ -device qxl,id=video1,... "-global" is the only way to define vram_size for the primary qxl device, regardless of how qemu names it, (It's not good a good way, as original idea of "-global" is to set a global default for a driver property, but to specify vram for first qxl device, we have to use it). For other qxl devices, as they are represented by "-device", could specify it directly and seperately for each, and it overrides the default set by "-global" if specified. --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 16 +++++++++ tests/qemuhelptest.c | 1 + .../qemuxml2argv-graphics-spice-qxl-vga.args | 7 ++++ .../qemuxml2argv-graphics-spice-qxl-vga.xml | 36 ++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 4 +- tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5f08a20..cce6b5f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1118,6 +1118,8 @@ qemuCapsParseDeviceStr(const char *str, unsigned long long *flags) } if (strstr(str, "virtio-net-pci.tx=")) *flags |= QEMUD_CMD_FLAG_VIRTIO_TX_ALG; + if (strstr(str, "name \"qxl-vga\"")) + *flags |= QEMUD_CMD_FLAG_DEVICE_QXL_VGA; return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 63cbbb3..f36c3ab 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -93,6 +93,7 @@ enum qemuCapsFlags { QEMUD_CMD_FLAG_CHARDEV_SPICEVMC = (1LL << 56), /* newer -chardev spicevmc */ QEMUD_CMD_FLAG_DEVICE_SPICEVMC = (1LL << 57), /* older -device spicevmc*/ QEMUD_CMD_FLAG_VIRTIO_TX_ALG = (1LL << 58), /* -device virtio-net-pci,tx=string */ + QEMUD_CMD_FLAG_DEVICE_QXL_VGA = (1LL << 59), /* Is the primary and vga compatible qxl device named qxl-vga? */ }; virCapsPtr qemuCapsInit(virCapsPtr old_caps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0db2843..c0bc343 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1928,6 +1928,10 @@ qemuBuildVideoDevStr(virDomainVideoDefPtr video, virBufferVSprintf(&buf, "%s", model); virBufferVSprintf(&buf, ",id=%s", video->info.alias); + + if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && video->vram) + virBufferVSprintf(&buf, ",vram_size=%u", video->vram); + if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCmdFlags) < 0) goto error; @@ -4023,6 +4027,18 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArgList(cmd, "-vga", vgastr, NULL); + + if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { + if (def->videos[0]->vram && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE_QXL_VGA) + virCommandAddArgFormat(cmd, "-global qxl-vga.vram_size=%u", + def->videos[0]->vram); + else + virCommandAddArgFormat(cmd, "-global qxl.vram_size=%u", + def->videos[0]->vram); + } + } } } else { diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 11890ab..202888d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -481,6 +481,7 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_AIO | QEMUD_CMD_FLAG_CCID_PASSTHRU | QEMUD_CMD_FLAG_CHARDEV_SPICEVMC | + QEMUD_CMD_FLAG_DEVICE_QXL_VGA | QEMUD_CMD_FLAG_VIRTIO_TX_ALG, 12001, 1, 0); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args new file mode 100644 index 0000000..efc51d1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ +/dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\ +x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ +qxl -global qxl-vga.vram_size=65536 -device qxl,id=video1,vram_size=65536,bus=pci.0,addr=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml new file mode 100644 index 0000000..fc9f3fe --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <input type='mouse' bus='ps2'/> + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + </graphics> + <video> + <model type='qxl' vram='65536' heads='1'/> + </video> + <video> + <model type='qxl' vram='65536' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index a8fb243..f7109b0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ -qxl -device qxl,id=video1,bus=pci.0,addr=0x4 -device virtio-balloon-pci,\ -id=balloon0,bus=pci.0,addr=0x3 +qxl -global qxl.vram_size=65536 -device qxl,id=video1,vram_size=65536,bus=pci.0,addr=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4817d51..d5b240e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -354,6 +354,10 @@ mymain(int argc, char **argv) DO_TEST("graphics-spice", QEMUD_CMD_FLAG_VGA | QEMUD_CMD_FLAG_VGA_QXL | QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_SPICE, false); + DO_TEST("graphics-spice-qxl-vga", + QEMUD_CMD_FLAG_VGA | QEMUD_CMD_FLAG_VGA_QXL | + QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_SPICE | + QEMUD_CMD_FLAG_DEVICE_QXL_VGA, false); DO_TEST("input-usbmouse", 0, false); DO_TEST("input-usbtablet", 0, false); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 67e721b..c0c36ad 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -152,6 +152,7 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl"); DO_TEST("graphics-sdl-fullscreen"); DO_TEST("graphics-spice"); + DO_TEST("graphics-spice-qxl-vga"); DO_TEST("input-usbmouse"); DO_TEST("input-usbtablet"); DO_TEST("input-xen"); -- 1.7.4

2 5

[libvirt] [PATCH] util: Allow removing hash entries in virHashForEach
by Jiri Denemark 04 Mar '11

04 Mar '11

This fixes a possible crash of libvirtd during its startup. When qemu driver reconnects to running domains, it iterates over all domain objects in a hash. When reconnecting to an associated qemu monitor fails and the domain is transient, it's immediately removed from the hash. Despite the fact that it's explicitly forbidden to do so. If libvirtd is lucky enough, virHashForEach will access random memory when the callback finishes and the deamon will crash. Since it's trivial to fix virHashForEach to allow removal of hash entries while iterating through them, I went this way instead of fixing qemuReconnectDomain callback (and possibly others) to avoid deleting the entries. --- src/util/hash.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/hash.c b/src/util/hash.c index 92ee234..2a9a9cf 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -548,9 +548,8 @@ virHashRemoveEntry(virHashTablePtr table, const void *name) * @data: opaque data to pass to the iterator * * Iterates over every element in the hash table, invoking the - * 'iter' callback. The callback must not call any other virHash* - * functions, and in particular must not attempt to remove the - * element. + * 'iter' callback. The callback is allowed to remove the element using + * virHashRemoveEntry but calling other virHash* functions is prohibited. * * Returns number of items iterated over upon completion, -1 on failure */ @@ -563,11 +562,12 @@ int virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) { for (i = 0 ; i < table->size ; i++) { virHashEntryPtr entry = table->table + i; while (entry) { + virHashEntryPtr next = entry->next; if (entry->valid) { iter(entry->payload, entry->name, data); count++; } - entry = entry->next; + entry = next; } } return (count); -- 1.7.4.1

3 4

[libvirt] [RFC PATCHv2 0/3] outgoing migration via fd: rather than exec:
by Eric Blake 03 Mar '11

03 Mar '11

Posted as an RFC because there are still two open bugs to be solved. I've tested that with this installed, I was able to do 'virsh save domain file' without compression to a local file using qemu fd: migration. 1. I'm working on making virFileOperation use SCM_RIGHTS so that we can pass an arbitrary fd from the child back to the parent. This is necessary for supporting root-squash NFS domain save via fd, since a child cannot consistently modify the appropriate locks necessary to issue a monitor command (the current virFileOperation implementation guarantees that the hook will execute on the right fd, but does not guarantee whether the operation is in the parent or a child, and thus the operation is not permitted to modify any state in the parent other than by its return value). The current state of the patch just falls back to exec: migration if the parent process can't reopen the fd. 2. I also need to test for qemu capabilities, as qemu 0.11.0 does _not_ support fd: migration, so the old exec: migration path must remain. But checking for capabilities is a bear in itself, since we should be caching qemu capabilities when a domain is started, and not calling 'qemu -help' for every subsequent command that needs to know. Eric Blake (3): qemu: use lighter-weight fd:n on incoming tunneled migration qemu: support migration to fd qemu: allow simple domain save to use fd: protocol src/qemu/qemu_driver.c | 16 ++++++++++++-- src/qemu/qemu_migration.c | 44 +++++++++++------------------------------ src/qemu/qemu_monitor.c | 22 +++++++++++++++++++++ src/qemu/qemu_monitor.h | 4 +++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++- src/qemu/qemu_monitor_json.h | 6 ++++- src/qemu/qemu_monitor_text.c | 24 +++++++++++++++++++++- src/qemu/qemu_monitor_text.h | 6 ++++- 8 files changed, 103 insertions(+), 40 deletions(-) -- 1.7.4

2 6

[libvirt] [PATCH] esx: Escape password for XML
by Matthias Bolte 03 Mar '11

03 Mar '11

Passwords are allowed to contain <, >, &, ', " characters. Those need to be replaced by the corresponding entities. Reported by Hereward Cooper. --- src/esx/esx_driver.c | 28 ++++++++++++++++++++++------ src/esx/esx_util.c | 19 +++++++++++++++++++ src/esx/esx_util.h | 2 ++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 116ad0f..13374b7 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -626,6 +626,7 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; + char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -657,13 +658,19 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, } } - password = virRequestPassword(auth, username, hostname); + unescapedPassword = virRequestPassword(auth, username, hostname); - if (password == NULL) { + if (unescapedPassword == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } + password = esxUtil_EscapeForXml(unescapedPassword); + + if (password == NULL) { + goto cleanup; + } + if (virAsprintf(&url, "%s://%s:%d/sdk", priv->transport, hostname, port) < 0) { virReportOOMError(); @@ -727,8 +734,9 @@ esxConnectToHost(esxPrivate *priv, virConnectAuthPtr auth, result = 0; cleanup: - VIR_FREE(password); VIR_FREE(username); + VIR_FREE(unescapedPassword); + VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&hostSystem); @@ -748,6 +756,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; + char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -779,13 +788,19 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, } } - password = virRequestPassword(auth, username, hostname); + unescapedPassword = virRequestPassword(auth, username, hostname); - if (password == NULL) { + if (unescapedPassword == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } + password = esxUtil_EscapeForXml(unescapedPassword); + + if (password == NULL) { + goto cleanup; + } + if (virAsprintf(&url, "%s://%s:%d/sdk", priv->transport, hostname, port) < 0) { virReportOOMError(); @@ -822,8 +837,9 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, result = 0; cleanup: - VIR_FREE(password); VIR_FREE(username); + VIR_FREE(unescapedPassword); + VIR_FREE(password); VIR_FREE(url); return result; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 2603957..9ef947c 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -552,3 +552,22 @@ esxUtil_EscapeDatastoreItem(const char *string) return escaped2; } + + + +char * +esxUtil_EscapeForXml(const char *string) +{ + virBuffer buffer = VIR_BUFFER_INITIALIZER; + + virBufferEscapeString(&buffer, "%s", string); + + if (virBufferError(&buffer)) { + virReportOOMError(); + virBufferFreeAndReset(&buffer); + + return NULL; + } + + return virBufferContentAndReset(&buffer); +} diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index d00e28a..39fdb6d 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -62,4 +62,6 @@ void esxUtil_ReplaceSpecialWindowsPathChars(char *string); char *esxUtil_EscapeDatastoreItem(const char *string); +char *esxUtil_EscapeForXml(const char *string); + #endif /* __ESX_UTIL_H__ */ -- 1.7.0.4

2 2

[libvirt] [PATCH] util: correct retry path in virFileOperation
by Eric Blake 03 Mar '11

03 Mar '11

In virFileOperation, the parent does a fallback to a non-fork attempt if it detects that the child returned EACCES. However, the child was calling _exit(-EACCESS), which does _not_ appear as EACCES in the parent. * src/util/util.c (virFileOperation): Correctly pass EACCES from child to parent. --- src/util/util.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index bac71c8..0fe1c41 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1559,6 +1559,15 @@ parenterror: goto childerror; } childerror: + /* Hook sets ret to -errno on failure, but exit must be positive. + * If we exit with EACCES, then parent tries again. */ + /* XXX This makes assumptions about errno being < 255, which is + * not true on Hurd. */ + ret = -ret; + if ((ret & 0xff) != ret) { + VIR_WARN("unable to pass desired return value %d", ret); + ret = 0xff; + } _exit(ret); } -- 1.7.4

3 3

[libvirt] [PATCH 1/2] maint: avoid long lines in more tests
by Eric Blake 03 Mar '11

03 Mar '11

* tests/xml2sexprdata/*.sexpr: Add backslash-newlines. * tests/sexpr2xmldata/*.sexpr: Likewise. * tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args: Likewise. --- Mind-numbing replacement of long lines with backslash-newline pairs to make them less than 80 columns. Also fixes the annoying files in tests/sexpr2xmldata that didn't used to end in newlines. Prereq to keep 'make syntax-check' happy after the next patch in the series. [What's the bet that git send-email choked on this message?] tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 7 ++++++- tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 7 ++++++- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr | 11 ++++++++++- .../sexpr2xml-disk-block-shareable.sexpr | 7 ++++++- tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr | 9 ++++++++- .../sexpr2xml-disk-drv-blktap-qcow.sexpr | 9 ++++++++- .../sexpr2xml-disk-drv-blktap-raw.sexpr | 9 ++++++++- .../sexpr2xml-disk-drv-blktap2-raw.sexpr | 9 ++++++++- tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr | 9 ++++++++- tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr | 10 +++++++++- .../sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr | 10 +++++++++- .../sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr | 10 +++++++++- .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 10 +++++++++- .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr | 10 +++++++++- .../sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr | 10 +++++++++- .../sexpr2xml-fv-serial-tcp-telnet.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr | 6 +++++- tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr | 9 ++++++++- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 9 ++++++++- .../sexpr2xml-pv-vfb-new-vncdisplay.sexpr | 11 ++++++++++- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr | 10 +++++++++- tests/sexpr2xmldata/sexpr2xml-pv.sexpr | 9 ++++++++- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 6 +++++- tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 7 ++++++- .../xml2sexpr-disk-block-shareable.sexpr | 7 ++++++- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 9 ++++++++- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 9 ++++++++- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 9 ++++++++- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 9 ++++++++- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 9 ++++++++- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 9 ++++++++- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 10 +++++++++- .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 10 +++++++++- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 10 +++++++++- .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 10 +++++++++- .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 11 ++++++++++- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 6 +++++- tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr | 7 ++++++- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 9 ++++++++- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 11 ++++++++++- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 10 +++++++++- tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 ++++++++- 92 files changed, 801 insertions(+), 92 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args index 15d2a1b..80617d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args @@ -1 +1,6 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,format=qcow2,cache=none,aio=native -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,bus=1,unit=0,format=raw,aio=threads -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ +format=qcow2,cache=none,aio=native -drive file=/dev/HostVG/QEMUGuest2,if=ide,\ +media=cdrom,bus=1,unit=0,format=raw,aio=threads -net none -serial none \ +-parallel none -usb diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr b/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr index f42fc32..c8c0cb1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr @@ -1 +1,6 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')\ +(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr index 24143a3..cb9e3f8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr @@ -1 +1,10 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(ip '192.0.2.1'))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ +(script 'vif-bridge')(ip '192.0.2.1'))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr index 184c1e8..80d4167 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr @@ -1 +1,6 @@ -(domain (domid 6)(name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)(uuid '49a0c6ffc066539264983632d093c2e7')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')(script 'vif-bridge')))) +(domain (domid 6)(name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\ +(uuid '49a0c6ffc066539264983632d093c2e7')(bootloader '/usr/bin/pygrub')\ +(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ +(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\ +(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\ +(script 'vif-bridge')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr index 01dd420..3f64ba6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr index 5c7c8ee..b96fa61 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap (dev 'xvda')(uname 'tap:qcow:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\ +(uname 'tap:qcow:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr index ac11292..ef7cb4b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\ +(uname 'tap:aio:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr index 79bc9b1..a72a733 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap2 (dev 'xvda')(uname 'tap2:aio:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\ +(uname 'tap2:aio:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr index ddf7810..d582ea0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr index 96f699c..25231ad 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr @@ -1 +1,9 @@ -(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\ +(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr index 1668e15..9caf8a0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)(localtime 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)(localtime 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr index 47ff828..e7031dc 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type 'ioemu')))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(model 'e1000')(type 'ioemu')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr index eee2304..acfc477 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type 'netfront')))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type 'netfront')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr index 104f979..39a8fbb 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\ +(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr index e709eb0..32bf699 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr index 3a14cf9..ddd94fd 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8ff')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr index 28c4346..40e0200 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr index a87c493..4670468 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr index 11a7952..2dacb90 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr index 0ef0576..85cf07e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr index 58e223c..6a559e7 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr @@ -1 +1,9 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr index ed914f7..cda45e4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr @@ -1 +1,10 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial telnet:localhost:9999,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial telnet:localhost:9999,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr index 5d49158..94ae80e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr @@ -1 +1,10 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial tcp:localhost:9999,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial tcp:localhost:9999,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr index f07dc4e..8e1aeb8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr @@ -1 +1,10 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial udp:localhost:9998@localhost:9999)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial udp:localhost:9998@localhost:9999)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr index ff46c64..2bab722 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr @@ -1 +1,10 @@ -(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial unix:/tmp/serial.sock,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(domain (domid 1)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial unix:/tmp/serial.sock,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr index 08ef565..6937813 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)(soundhw 'all')))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr index 79115d0..ff22666 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)(soundhw 'sb16,es1370')))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr index da9ae6a..dcc6ab2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr index 058166f..39e5a72 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr index 5d4579d..c34c7da 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr index bd71958..92e807c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(acpi 1)(vnc 1)\ +(keymap ja)))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')\ +(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr index 5d4579d..c34c7da 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv.sexpr @@ -1 +1,9 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr index 6ef84c4..70a57c4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr @@ -1 +1,9 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr index 2c838f9..a560380 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr @@ -1 +1,10 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(model 'e1000')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ +(script 'vif-bridge')(model 'e1000')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr b/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr index a1a0ab5..d0e4cd5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr @@ -1 +1,10 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script 'vif-routed')(ip '172.14.5.6'))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script 'vif-routed')\ +(ip '172.14.5.6'))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr b/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr index 624c6e9..29f4665 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr @@ -1 +1,10 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (pci (backend 0)(dev (domain 0x0001) (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13) (func 0x0))))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (pci (backend 0)(dev (domain 0x0001)\ + (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13)\ + (func 0x0))))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr index 51b511c..7161557 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr @@ -1 +1,5 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pypxeboot')(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\ +(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr index 9951f79..e80259c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(localtime 1)(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')(localtime 1)\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr index 2be6822..200b8ca 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)\ +(vcpu_avail 3)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr index 76c7947..0a2c45c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr @@ -1 +1,10 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 0)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)(vncdisplay 25))))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)\ +(vncunused 0)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)\ +(vncdisplay 25))))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr index f0f8df7..3fdc8a5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr @@ -1 +1,9 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 1)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja))))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 1)\ +(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja))))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr index 4452b1e..c825f32 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr @@ -1 +1,9 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(vnc 1)(vncunused 1)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')(vnc 1)(vncunused 1)(vnclisten 0.0.0.0)\ +(vncpasswd 123456)(keymap ja)))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv.sexpr index ddf7810..d582ea0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-pv.sexpr @@ -1 +1,8 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) +(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))) diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr index 49d9f8d..88c0f68 100644 --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr @@ -1 +1,5 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')(image (linux \ +(kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')(args '(hd0,0)/grub/menu.lst')))\ +(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr index 898fe2d..56ff525 100644 --- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(ip '192.0.2.1')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')(image (linux \ +(kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ +(script 'vif-bridge')(ip '192.0.2.1'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr index 4b9c9a7..e7149b3 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr @@ -1 +1,6 @@ -(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge')))) \ No newline at end of file +(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ +(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ +(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ +(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\ +(script 'vif-bridge'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr index 6c7aa54..8c0b1cd 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr @@ -1 +1,6 @@ -(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')(script 'vif-bridge')))) \ No newline at end of file +(vm (name 'pvtest')(memory 384)(maxmem 512)(vcpus 1)\ +(uuid '49a0c6ff-c066-5392-6498-3632d093c2e7')(bootloader '/usr/bin/pygrub')\ +(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')\ +(device (tap (dev 'xvda')(uname 'tap:aio:/var/lib/xen/images/rhel5pv.img')\ +(mode 'w!')))(device (vif (mac '00:16:3e:23:9e:eb')(bridge 'xenbr0')\ +(script 'vif-bridge'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr index 1885c55..960801a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-block.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr index 1885c55..960801a 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr index 61609b3..1e1b381 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap (dev 'xvda')(uname 'tap:qcow:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\ +(uname 'tap:qcow:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr index ad2d730..6b66e43 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\ +(uname 'tap:aio:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr index ad2d730..6b66e43 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap (dev 'xvda')\ +(uname 'tap:aio:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr index 0293cc6..1e79bcf 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap2 (dev 'xvda')(uname 'tap2:aio:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\ +(uname 'tap2:aio:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr index 0293cc6..1e79bcf 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (tap2 (dev 'xvda')(uname 'tap2:aio:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (tap2 (dev 'xvda')\ +(uname 'tap2:aio:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr index 60db610..dac0aa3 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr index 60db610..dac0aa3 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-disk-file.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr b/tests/xml2sexprdata/xml2sexpr-escape.sexpr index c78d6a6..7b29131 100644 --- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-escape.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5…"devel" ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os&version="devel" ')\ +(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\ +(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))\ +(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/\'\\some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr index 2f91138..4950832 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\ +(boot c)(usb 1)(parallel none)(serial pty)\ +(device_model '/usr/lib/xen/bin/qemu-dm')))\ +(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr index f2a94f6..4f91119 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')(localtime 1)\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ +(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr index e9fd597..71df15b 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr @@ -1 +1,8 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ +(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr index c888592..7fe2544 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr @@ -1 +1,8 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type netfront)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ +(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type netfront))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr index 1fcf7e6..38504b1 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel tcp:localhost:9999)\ +(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr index 2048159..f3bfbd7 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr index f00e69c..9ecbbe0 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr index 7c2b388..be40218 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr index d9eecdf..40243a7 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial null)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr index c4fe7cd..4e2dc78 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')\ +(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr index 3af2233..7ae9315 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial pty)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr index f918169..8369bb4 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial stdio)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr index 9326199..40120cf 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial telnet:localhost:9999,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial telnet:localhost:9999,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr index 50b0b70..7938a7b 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial tcp:localhost:9999,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial tcp:localhost:9999,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr index 279dbf4..3c19f25 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial udp:localhost:9998@localhost:9999)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial udp:localhost:9998@localhost:9999)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr index 94ff6f9..67ceeaa 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial unix:/tmp/serial.sock,server,nowait)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)\ +(serial unix:/tmp/serial.sock,server,nowait)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr index 25868c4..4c37c35 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ +(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr index f904d9b..c0ad2bc 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\ +(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr index 6ab3c9d..ff1c695 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(parallel none)\ +(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr index 451c77d..81fb92d 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr index 84a121f..b27e990 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ +(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')))\ +(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr index 089e66e..908ae94 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr @@ -1 +1,10 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ +(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\ +(vnc 1)(vncunused 1)(keymap 'ja')))(device (vbd (dev 'hda:disk')\ +(uname 'file:/root/foo.img')(mode 'w')))(device (vbd (dev 'hdc:cdrom')\ +(uname 'file:/root/boot.iso')(mode 'r')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr index 451c77d..81fb92d 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-fv.sexpr @@ -1 +1,9 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\ +(cdrom '/root/boot.iso')(acpi 1)(usb 1)(parallel none)(serial none)\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))\ +(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')\ +(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr index fbc5c43..0c0c62e 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ +(script 'vif-bridge'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr index a040966..d95ed82 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(model 'e1000')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ +(script 'vif-bridge')(model 'e1000'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr index eed9bbc..3430e31 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-net-routed.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')(ip '172.14.5.6')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))\ +(device (vif (mac '00:11:22:33:44:55')(script 'vif-routed')\ +(ip '172.14.5.6'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr index 548bea3..eeebee3 100644 --- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr @@ -1 +1,9 @@ -(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7-d26a-307a-438c-6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu)))) \ No newline at end of file +(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)\ +(uuid 'cc2315e7-d26a-307a-438c-6d188ec4c09c')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\ +(apic 1)(pae 1)(usb 1)(parallel none)(serial none)\ +(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncunused 0)(vncdisplay 6)))\ +(device (vbd (dev 'hda:disk')(uname 'phy:/dev/sda8')(mode 'w')))\ +(device (vbd (dev 'hdc:cdrom')(mode 'r')))\ +(device (vif (mac '00:16:3e:0a:7b:39')(model 'e1000')(type ioemu))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr index b767932..fdc48cf 100644 --- a/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0))))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'phy:/dev/MainVG/GuestLV')(mode 'w')))\ +(device (pci (dev (domain 0x0001)(bus 0x0c)(slot 0x1b)(func 0x2))\ +(dev (domain 0x0000)(bus 0x01)(slot 0x13)(func 0x0)))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr index 70b06f4..c11938e 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr @@ -1 +1,5 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(bootloader '/usr/bin/pypxeboot')\ +(bootloader_args 'mac=AA:00:86:e2:35:72')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr index 16bbdfd..589bbdf 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr @@ -1 +1,6 @@ -(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge')))) \ No newline at end of file +(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)\ +(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')\ +(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)\ +(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')\ +(script 'vif-bridge'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr index e886545..df854ca 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 4)(vcpu_avail 3)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr index 42a8bc3..5eb0133 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\ +(device (vfb (type vnc)(vncunused 1)(vnclisten '127.0.0.1')\ +(vncpasswd '123456')(keymap 'ja'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr index 7d4de13..c74098f 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr @@ -1 +1,10 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))\ +(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')\ +(vncpasswd '123456')(keymap 'ja'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr index 9857066..1e22b83 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr @@ -1 +1,9 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(vnc 1)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')(vnc 1)(vncunused 0)(vncdisplay 6)\ +(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))\ +(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-pv.sexpr b/tests/xml2sexprdata/xml2sexpr-pv.sexpr index 60db610..dac0aa3 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv.sexpr @@ -1 +1,8 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ +(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')\ +(on_reboot 'destroy')(on_crash 'destroy')\ +(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ +(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\ +(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\ +core/test/5.91/x86_64/os ')))(device (vbd (dev 'xvda')\ +(uname 'file:/root/some.img')(mode 'w'))))\ -- 1.7.4

2 3