David Kiarie wrote:
> From: Kiarie Kahurani <davidkiarie4@xxxxxxxxx>
>
> introduce functions
>
s/functions/function/
Regards,
Jim
> xenFormatXMCPUFeatures(virConfPtr conf, ......);
> which formats CPU features config instead
>
> signed-off-by: David Kiarie<davidkiarie4@xxxxxxxxx>
> ---
> src/xenxs/xen_xm.c | 118 ++++++++++++---------
> tests/xmconfigdata/test-escape-paths.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-localtime.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 6 +-
> .../test-fullvirt-serial-dev-2-ports.cfg | 6 +-
> .../test-fullvirt-serial-dev-2nd-port.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-file.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-null.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 6 +-
> .../test-fullvirt-serial-tcp-telnet.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-sound.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 6 +-
> tests/xmconfigdata/test-fullvirt-utc.cfg | 6 +-
> tests/xmconfigdata/test-no-source-cdrom.cfg | 6 +-
> tests/xmconfigdata/test-pci-devs.cfg | 6 +-
> 27 files changed, 146 insertions(+), 128 deletions(-)
>
> diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
> index 5a585ce..6bd04ba 100644
> --- a/src/xenxs/xen_xm.c
> +++ b/src/xenxs/xen_xm.c
> @@ -1935,6 +1935,73 @@ xenFormatXMDomainDisks(virConfPtr conf, virDomainDefPtr def,
> virConfFreeValue(diskVal);
> return -1;
> }
> +
> +
> +static int
> +xenFormatXMCPUFeatures(virConfPtr conf, virDomainDefPtr def,
> + int xendConfigVersion)
> +{
> + char *cpus = NULL;
> + size_t i;
> +
> + if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0)
> + return -1;
> + /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
> + either 32, or 64 on a platform where long is big enough. */
> + if (def->vcpus < def->maxvcpus &&
> + xenXMConfigSetInt(conf, "vcpu_avail", (1UL << def->vcpus) - 1) < 0)
> + return -1;
> +
> + if ((def->cpumask != NULL) &&
> + ((cpus = virBitmapFormat(def->cpumask)) == NULL)) {
> + return -1;
> + }
> +
> + if (cpus &&
> + xenXMConfigSetString(conf, "cpus", cpus) < 0)
> + return -1;
> +
> + VIR_FREE(cpus);
> + if (STREQ(def->os.type, "hvm")) {
> + if (xenXMConfigSetInt(conf, "pae",
> + (def->features[VIR_DOMAIN_FEATURE_PAE] ==
> + VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> + return -1;
> +
> + if (xenXMConfigSetInt(conf, "acpi",
> + (def->features[VIR_DOMAIN_FEATURE_ACPI] ==
> + VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> + return -1;
> +
> + if (xenXMConfigSetInt(conf, "apic",
> + (def->features[VIR_DOMAIN_FEATURE_APIC] ==
> + VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> + return -1;
> +
> + if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) {
> + if (xenXMConfigSetInt(conf, "hap",
> + (def->features[VIR_DOMAIN_FEATURE_HAP] ==
> + VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> + return -1;
> +
> + if (xenXMConfigSetInt(conf, "viridian",
> + (def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] ==
> + VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> + return -1;
> + }
> +
> + for (i = 0; i < def->clock.ntimers; i++) {
> + if (def->clock.timers[i]->name == VIR_DOMAIN_TIMER_NAME_HPET &&
> + def->clock.timers[i]->present != -1 &&
> + xenXMConfigSetInt(conf, "hpet", def->clock.timers[i]->present) < 0)
> + return -1;
> + }
> + }
> +
> + return 0;
> +}
> +
> +
> /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
> either 32, or 64 on a platform where long is big enough. */
> verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT);
> @@ -1959,24 +2026,9 @@ xenFormatXM(virConnectPtr conn,
> if (xenFormatXMMem(conf, def) < 0)
> goto cleanup;
>
> - if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0)
> - goto cleanup;
> - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
> - either 32, or 64 on a platform where long is big enough. */
> - if (def->vcpus < def->maxvcpus &&
> - xenXMConfigSetInt(conf, "vcpu_avail", (1UL << def->vcpus) - 1) < 0)
> + if (xenFormatXMCPUFeatures(conf, def, xendConfigVersion) < 0)
> goto cleanup;
>
> - if ((def->cpumask != NULL) &&
> - ((cpus = virBitmapFormat(def->cpumask)) == NULL)) {
> - goto cleanup;
> - }
> -
> - if (cpus &&
> - xenXMConfigSetString(conf, "cpus", cpus) < 0)
> - goto cleanup;
> - VIR_FREE(cpus);
> -
> hvm = STREQ(def->os.type, "hvm") ? 1 : 0;
>
> if (hvm) {
> @@ -2015,40 +2067,6 @@ xenFormatXM(virConnectPtr conn,
> if (xenXMConfigSetString(conf, "boot", boot) < 0)
> goto cleanup;
>
> - if (xenXMConfigSetInt(conf, "pae",
> - (def->features[VIR_DOMAIN_FEATURE_PAE] ==
> - VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> - goto cleanup;
> -
> - if (xenXMConfigSetInt(conf, "acpi",
> - (def->features[VIR_DOMAIN_FEATURE_ACPI] ==
> - VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> - goto cleanup;
> -
> - if (xenXMConfigSetInt(conf, "apic",
> - (def->features[VIR_DOMAIN_FEATURE_APIC] ==
> - VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> - goto cleanup;
> -
> - if (xendConfigVersion >= XEND_CONFIG_VERSION_3_0_4) {
> - if (xenXMConfigSetInt(conf, "hap",
> - (def->features[VIR_DOMAIN_FEATURE_HAP] ==
> - VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> - goto cleanup;
> -
> - if (xenXMConfigSetInt(conf, "viridian",
> - (def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] ==
> - VIR_TRISTATE_SWITCH_ON) ? 1 : 0) < 0)
> - goto cleanup;
> - }
> -
> - for (i = 0; i < def->clock.ntimers; i++) {
> - if (def->clock.timers[i]->name == VIR_DOMAIN_TIMER_NAME_HPET &&
> - def->clock.timers[i]->present != -1 &&
> - xenXMConfigSetInt(conf, "hpet", def->clock.timers[i]->present) < 0)
> - goto cleanup;
> - }
> -
> if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) {
> for (i = 0; i < def->ndisks; i++) {
> if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
> diff --git a/tests/xmconfigdata/test-escape-paths.cfg b/tests/xmconfigdata/test-escape-paths.cfg
> index 13be2a0..4a18cc1 100644
> --- a/tests/xmconfigdata/test-escape-paths.cfg
> +++ b/tests/xmconfigdata/test-escape-paths.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader&test"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader&test"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> index 178aecd..c1afc08 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.cfg
> @@ -3,13 +3,13 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> hpet = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> index 44f5ac7..397d8ef 100644
> --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.cfg
> @@ -3,13 +3,13 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> hpet = 0
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.cfg b/tests/xmconfigdata/test-fullvirt-localtime.cfg
> index d4eb4a9..7292e7f 100755
> --- a/tests/xmconfigdata/test-fullvirt-localtime.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-localtime.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 1
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg b/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
> index 922450b..ef97329 100644
> --- a/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> index d15f1f5..385f917 100644
> --- a/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> index 922450b..ef97329 100755
> --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
> index 5d2ab81..27407e7 100755
> --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> cdrom = "/root/boot.iso"
> localtime = 0
> on_poweroff = "destroy"
> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> index 4588f1f..86e0aa0 100755
> --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
> index 86e7998..8ada1fd 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
> index 287e08a..61e2af3 100644
> --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.cfg b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> index 08accf6..ad4a874 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-file.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.cfg b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> index f16c9c2..a11c42a 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-null.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> index 1e1fa54..1ee0bc8 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> index ea4d4a5..10465a5 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> index a4e30c5..3733161 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> index 2164738..442309f 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> index 7f17781..f141269 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> index 1af3c7b..3ccc4a7 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> index 309c89e..dd250ac 100755
> --- a/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-sound.cfg b/tests/xmconfigdata/test-fullvirt-sound.cfg
> index c4f54fe..d315f93 100644
> --- a/tests/xmconfigdata/test-fullvirt-sound.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-sound.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> index 8a66035..3d30bb1 100755
> --- a/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> index 24c159e..4463e31 100755
> --- a/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-fullvirt-utc.cfg b/tests/xmconfigdata/test-fullvirt-utc.cfg
> index 922450b..ef97329 100755
> --- a/tests/xmconfigdata/test-fullvirt-utc.cfg
> +++ b/tests/xmconfigdata/test-fullvirt-utc.cfg
> @@ -3,12 +3,12 @@ uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> maxmem = 579
> memory = 394
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "d"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "d"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "restart"
> diff --git a/tests/xmconfigdata/test-no-source-cdrom.cfg b/tests/xmconfigdata/test-no-source-cdrom.cfg
> index 7b258e5..ee22632 100644
> --- a/tests/xmconfigdata/test-no-source-cdrom.cfg
> +++ b/tests/xmconfigdata/test-no-source-cdrom.cfg
> @@ -3,12 +3,12 @@ uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c"
> maxmem = 382
> memory = 350
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "c"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "c"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "destroy"
> diff --git a/tests/xmconfigdata/test-pci-devs.cfg b/tests/xmconfigdata/test-pci-devs.cfg
> index 9f9b2f4..6d19f21 100644
> --- a/tests/xmconfigdata/test-pci-devs.cfg
> +++ b/tests/xmconfigdata/test-pci-devs.cfg
> @@ -3,12 +3,12 @@ uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c"
> maxmem = 382
> memory = 350
> vcpus = 1
> -builder = "hvm"
> -kernel = "/usr/lib/xen/boot/hvmloader"
> -boot = "c"
> pae = 1
> acpi = 1
> apic = 1
> +builder = "hvm"
> +kernel = "/usr/lib/xen/boot/hvmloader"
> +boot = "c"
> localtime = 0
> on_poweroff = "destroy"
> on_reboot = "destroy"
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list