diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2010-05-25 15:33:51 +0100 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2010-05-25 17:09:18 +0100 |
| commit | 60881161ea7c05a80af145582fc6659e69a20ef8 (patch) | |
| tree | a223962491e034ae78e8eb233906012805e72a09 /tests/confdata | |
| parent | Fix handling of disk backing stores with cgroups (diff) | |
| download | libvirt-60881161ea7c05a80af145582fc6659e69a20ef8.tar.gz libvirt-60881161ea7c05a80af145582fc6659e69a20ef8.tar.bz2 libvirt-60881161ea7c05a80af145582fc6659e69a20ef8.zip | |
Expose a host UUID in the capabilities XML
Allow for a host UUID in the capabilities XML. Local drivers
will initialize this from the SMBIOS data. If a sanity check
shows SMBIOS uuid is invalid, allow an override from the
libvirtd.conf configuration file
* daemon/libvirtd.c, daemon/libvirtd.conf: Support a host_uuid
configuration option
* docs/schemas/capability.rng: Add optional host uuid field
* src/conf/capabilities.c, src/conf/capabilities.h: Include
host UUID in XML
* src/libvirt_private.syms: Export new uuid.h functions
* src/lxc/lxc_conf.c, src/qemu/qemu_driver.c,
src/uml/uml_conf.c: Set host UUID in capabilities
* src/util/uuid.c, src/util/uuid.h: Support for host UUIDs
* src/node_device/node_device_udev.c: Use the host UUID functions
* tests/confdata/libvirtd.conf, tests/confdata/libvirtd.out: Add
new host_uuid config option to test
Diffstat (limited to 'tests/confdata')
| -rw-r--r-- | tests/confdata/libvirtd.conf | 9 | ||||
| -rw-r--r-- | tests/confdata/libvirtd.out | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/tests/confdata/libvirtd.conf b/tests/confdata/libvirtd.conf index 1fc875aab..a943bfa19 100644 --- a/tests/confdata/libvirtd.conf +++ b/tests/confdata/libvirtd.conf @@ -218,3 +218,12 @@ tls_allowed_dn_list = ["DN1", "DN2"] # # By default, no Username's are checked sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ] + +# UUID of the host: +# Provide the UUID of the host here in case the command +# 'dmidecode -s system-uuid' does not provide a valid uuid. In case +# 'dmidecode' does not provide a valid UUID and none is provided here, a +# temporary UUID will be generated. +# Keep the format of the example UUID below. + +host_uuid = "8510b1a1-1afa-4da6-8111-785fae202c1e" diff --git a/tests/confdata/libvirtd.out b/tests/confdata/libvirtd.out index 685744acd..0bebe2f1f 100644 --- a/tests/confdata/libvirtd.out +++ b/tests/confdata/libvirtd.out @@ -178,3 +178,10 @@ tls_allowed_dn_list = [ "DN1", "DN2" ] # # By default, no Username's are checked sasl_allowed_username_list = [ "joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ] +# UUID of the host: +# Provide the UUID of the host here in case the command +# 'dmidecode -s system-uuid' does not provide a valid uuid. In case +# 'dmidecode' does not provide a valid UUID and none is provided here, a +# temporary UUID will be generated. +# Keep the format of the example UUID below. +host_uuid = "8510b1a1-1afa-4da6-8111-785fae202c1e" |