May 2016 - Devel - libvirt List Archives

[libvirt] [PATCH v2] secret: Alter virSecretGetSecretString
by John Ferlan 13 May '16

13 May '16

Rather than returning a "char *" indicating perhaps some sized set of characters that is NUL terminated, alter the function to return 0 or -1 for success/failure and add two parameters to handle returning the buffer and it's size. The function no longer encodes the returned secret, rather it returns the unencoded secret forcing callers to make the necessary adjustments. Alter the callers to handle the adjusted model. Add a new function virStringBufferIsPrintable to handle checking if the plaintext secret that is about to be printed on the command line has non-printable characters and cause failure if it does. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: http://www.redhat.com/archives/libvir-list/2016-May/msg00870.html Changes since v1: libvirt_private.syms, virstring.c, virstring.h: - Introduce virStringBufferIsPrintable. I could make it a separate patch if so desired. libxl_conf.c, qemu_domain.c, qemu_command.c - Use new format of virSecretGetSecretString - Encode the secret after the call now when necessary - Use virStringBufferIsPrintable before printing iSCSI password secret_util.c: - Return int instead of uint8_t * - Remove 'encode' parameter - Add parameter "*ret_secret", alloc and return the secret in uint8_t * buf src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 24 +++++++++++++++++------- src/qemu/qemu_command.c | 18 +++++++++++++++++- src/qemu/qemu_domain.c | 17 +++++------------ src/qemu/qemu_domain.h | 3 ++- src/secret/secret_util.c | 45 ++++++++++++++++++++++----------------------- src/secret/secret_util.h | 15 ++++++++------- src/util/virstring.c | 19 +++++++++++++++++++ src/util/virstring.h | 1 + 9 files changed, 92 insertions(+), 51 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a980a32..b76d9d5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2301,6 +2301,7 @@ virSkipSpacesBackwards; virStrcpy; virStrdup; virStringArrayHasString; +virStringBufferIsPrintable; virStringFreeList; virStringFreeListCount; virStringGetFirstWithPrefix; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d927b37..2dfd03d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -47,6 +47,7 @@ #include "libxl_utils.h" #include "virstoragefile.h" #include "secret_util.h" +#include "base64.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -1018,7 +1019,9 @@ static int libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) { virConnectPtr conn = NULL; - char *secret = NULL; + uint8_t *secret = NULL; + char *base64secret = NULL; + size_t secretlen; char *username = NULL; int ret = -1; @@ -1030,21 +1033,28 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) if (!(conn = virConnectOpen("xen:///system"))) goto cleanup; - if (!(secret = virSecretGetSecretString(conn, - protocol, - true, - src->auth, - VIR_SECRET_USAGE_TYPE_CEPH))) + if (virSecretGetSecretString(conn, protocol, src->auth, + VIR_SECRET_USAGE_TYPE_CEPH, + &secret, &secretlen) < 0) goto cleanup; + + /* RBD expects an encoded secret */ + base64_encode_alloc((const char *)secret, secretlen, &base64secret); + memset(secret, 0, secretlen); + if (!base64secret) { + virReportOOMError(); + goto cleanup; + } } - if (!(*srcstr = libxlMakeNetworkDiskSrcStr(src, username, secret))) + if (!(*srcstr = libxlMakeNetworkDiskSrcStr(src, username, base64secret))) goto cleanup; ret = 0; cleanup: VIR_FREE(secret); + VIR_FREE(base64secret); virObjectUnref(conn); return ret; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0d6d5f8..18b268a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -56,6 +56,7 @@ #include "virscsi.h" #include "virnuma.h" #include "virgic.h" +#include "base64.h" #if defined(__linux__) # include <linux/capability.h> #endif @@ -628,6 +629,12 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, switch ((qemuDomainSecretInfoType) secinfo->type) { case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN: if (secinfo->s.plain.secret) { + if (!virStringBufferIsPrintable(secinfo->s.plain.secret, + secinfo->s.plain.secretlen)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("found non printable characters in secret")); + return -1; + } if (virAsprintf(&uri->user, "%s:%s", secinfo->s.plain.username, secinfo->s.plain.secret) < 0) @@ -662,6 +669,8 @@ static int qemuBuildRBDSecinfoURI(virBufferPtr buf, qemuDomainSecretInfoPtr secinfo) { + char *base64secret = NULL; + if (!secinfo) { virBufferAddLit(buf, ":auth_supported=none"); return 0; @@ -669,11 +678,18 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, switch ((qemuDomainSecretInfoType) secinfo->type) { case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN: + base64_encode_alloc((const char *)secinfo->s.plain.secret, + secinfo->s.plain.secretlen, &base64secret); + if (!base64secret) { + virReportOOMError(); + return -1; + } virBufferEscape(buf, '\\', ":", ":id=%s", secinfo->s.plain.username); virBufferEscape(buf, '\\', ":", ":key=%s:auth_supported=cephx\\;none", - secinfo->s.plain.secret); + base64secret); + VIR_FREE(base64secret); break; case VIR_DOMAIN_SECRET_INFO_TYPE_AES: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 39a50e6..2f94f23 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -731,7 +731,7 @@ static void qemuDomainSecretPlainFree(qemuDomainSecretPlain secret) { VIR_FREE(secret.username); - memset(secret.secret, 0, strlen(secret.secret)); + memset(secret.secret, 0, secret.secretlen); VIR_FREE(secret.secret); } @@ -870,7 +870,6 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, virStorageNetProtocol protocol, virStorageAuthDefPtr authdef) { - bool encode = false; int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; const char *protocolstr = virStorageNetProtocolTypeToString(protocol); @@ -878,18 +877,12 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, if (VIR_STRDUP(secinfo->s.plain.username, authdef->username) < 0) return -1; - if (protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { - /* qemu requires the secret to be encoded for RBD */ - encode = true; + if (protocol == VIR_STORAGE_NET_PROTOCOL_RBD) secretType = VIR_SECRET_USAGE_TYPE_CEPH; - } - - if (!(secinfo->s.plain.secret = - virSecretGetSecretString(conn, protocolstr, encode, - authdef, secretType))) - return -1; - return 0; + return virSecretGetSecretString(conn, protocolstr, authdef, secretType, + &secinfo->s.plain.secret, + &secinfo->s.plain.secretlen); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 331ade0..f074ca5 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -251,7 +251,8 @@ typedef struct _qemuDomainSecretPlain qemuDomainSecretPlain; typedef struct _qemuDomainSecretPlain *qemuDomainSecretPlainPtr; struct _qemuDomainSecretPlain { char *username; - char *secret; + uint8_t *secret; + size_t secretlen; }; # define QEMU_DOMAIN_AES_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */ diff --git a/src/secret/secret_util.c b/src/secret/secret_util.c index 217584f..5dff57c 100644 --- a/src/secret/secret_util.c +++ b/src/secret/secret_util.c @@ -27,7 +27,6 @@ #include "virlog.h" #include "virobject.h" #include "viruuid.h" -#include "base64.h" #include "datatypes.h" #define VIR_FROM_THIS VIR_FROM_SECRET @@ -38,27 +37,30 @@ VIR_LOG_INIT("secret.secret_util"); /* virSecretGetSecretString: * @conn: Pointer to the connection driver to make secret driver call * @scheme: Unique enough string for error message to help determine cause - * @encoded: Whether the returned secret needs to be base64 encoded * @authdef: Pointer to the disk storage authentication * @secretUsageType: Type of secret usage for authdef lookup + * @ret_secret: returned secret as a sized stream of unsigned chars + * @ret_secret_size: Return size of the secret - either raw text or base64 * - * Lookup the secret for the authdef usage type and return it either as - * raw text or encoded based on the caller's need. + * Lookup the secret for the authdef usage type and return it as raw text. + * It is up to the caller to encode the secret further. * - * Returns a pointer to memory that needs to be cleared and free'd after - * usage or NULL on error. + * Returns 0 on success, -1 on failure. On success the memory in ret_secret + * needs to be cleared and free'd after usage. */ -char * +int virSecretGetSecretString(virConnectPtr conn, const char *scheme, - bool encoded, virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) + virSecretUsageType secretUsageType, + uint8_t **ret_secret, + size_t *ret_secret_size) { size_t secret_size; virSecretPtr sec = NULL; - char *secret = NULL; + unsigned char *secret = NULL; char uuidStr[VIR_UUID_STRING_BUFLEN]; + int ret = -1; /* look up secret */ switch (authdef->secretType) { @@ -85,8 +87,8 @@ virSecretGetSecretString(virConnectPtr conn, goto cleanup; } - secret = (char *)conn->secretDriver->secretGetValue(sec, &secret_size, 0, - VIR_SECRET_GET_VALUE_INTERNAL_CALL); + secret = conn->secretDriver->secretGetValue(sec, &secret_size, 0, + VIR_SECRET_GET_VALUE_INTERNAL_CALL); if (!secret) { if (authdef->secretType == VIR_STORAGE_SECRET_TYPE_UUID) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -102,19 +104,16 @@ virSecretGetSecretString(virConnectPtr conn, goto cleanup; } - if (encoded) { - char *base64 = NULL; + if (VIR_ALLOC_N(*ret_secret, secret_size) < 0) + goto cleanup; - base64_encode_alloc(secret, secret_size, &base64); - VIR_FREE(secret); - if (!base64) { - virReportOOMError(); - goto cleanup; - } - secret = base64; - } + memcpy(*ret_secret, secret, secret_size); + *ret_secret_size = secret_size; + ret = 0; cleanup: virObjectUnref(sec); - return secret; + memset(secret, 0, secret_size); + VIR_FREE(secret); + return ret; } diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h index c707599..0520db3 100644 --- a/src/secret/secret_util.h +++ b/src/secret/secret_util.h @@ -25,11 +25,12 @@ # include "internal.h" # include "virstoragefile.h" -char *virSecretGetSecretString(virConnectPtr conn, - const char *scheme, - bool encoded, - virStorageAuthDefPtr authdef, - virSecretUsageType secretUsageType) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_RETURN_CHECK; +int virSecretGetSecretString(virConnectPtr conn, + const char *scheme, + virStorageAuthDefPtr authdef, + virSecretUsageType secretUsageType, + uint8_t **ret_secret, + size_t *ret_secret_size) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_SECRET_H__ */ diff --git a/src/util/virstring.c b/src/util/virstring.c index 735e65b..1679266 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1066,3 +1066,22 @@ virStringIsPrintable(const char *str) return true; } + + +/** + * virBufferIsPrintable: + * + * Returns true if @buf of @buflen contains only printable characters + */ +bool +virStringBufferIsPrintable(const uint8_t *buf, + size_t buflen) +{ + size_t i; + + for (i = 0; i < buflen; i++) + if (!c_isprint(buf[i])) + return false; + + return true; +} diff --git a/src/util/virstring.h b/src/util/virstring.h index fd2868a..9203aa3 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -276,5 +276,6 @@ bool virStringHasControlChars(const char *str); void virStringStripControlChars(char *str); bool virStringIsPrintable(const char *str); +bool virStringBufferIsPrintable(const uint8_t *buf, size_t buflen); #endif /* __VIR_STRING_H__ */ -- 2.5.5

2 1

[libvirt] [PATCH] network: log error when <bandwidth> is requested for hostdev interfaces
by Laine Stump 13 May '16

13 May '16

This would previously be silently ignored. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1319044 --- src/network/bridge_driver.c | 25 +++++++++++++++++++++++++ src/qemu/qemu_domain.c | 21 ++++++++++++++++----- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index bef8a78..0fd2095 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3126,6 +3126,20 @@ networkValidate(virNetworkDriverStatePtr driver, def->name); return -1; } + + if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { + for (i = 0; i < def->nPortGroups; i++) { + if (def->portGroups[i].bandwidth) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported <bandwidth> element " + "in <portgroup name='%s'> of " + "network '%s' with forward mode='%s'"), + def->portGroups[i].name, def->name, + virNetworkForwardTypeToString(def->forward.type)); + return -1; + } + } + } return 0; } @@ -4305,6 +4319,17 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + if (virDomainNetGetActualBandwidth(iface)) { + /* bandwidth configuration via libvirt is not supported for + * hostdev network devices + */ + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("bandwidth settings are not supported " + "for hostdev interfaces")); + goto error; + } + } if (netdef) { netdef->connections++; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f7356a2..4e32251 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2119,12 +2119,23 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); - if (dev->type == VIR_DOMAIN_DEVICE_NET && - dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && - !dev->data.net->model) { - if (VIR_STRDUP(dev->data.net->model, - qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + if (dev->type == VIR_DOMAIN_DEVICE_NET) { + virDomainNetDefPtr net = dev->data.net; + + if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && !net->model && + VIR_STRDUP(net->model, qemuDomainDefaultNetModel(def, qemuCaps)) < 0) + goto cleanup; + + if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV && + virDomainNetGetActualBandwidth(net)) { + /* bandwidth configuration via libvirt is not supported + * for hostdev network devices + */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("bandwidth settings are not supported " + "for hostdev interfaces")); goto cleanup; + } } /* set default disk types and drivers */ -- 2.5.5

2 3

[libvirt] [PATCH] Fix tests to include video ram size
by Ján Tomko 12 May '16

12 May '16

My commit 3e42867 started filling out the video size in post-parse, but did not adjust the tests. --- Pushed under the build breaker rule. tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml | 2 +- tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-default-feature.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- 73 files changed, 73 insertions(+), 73 deletions(-) diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml index a2668d1..6932e33 100644 --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -35,7 +35,7 @@ <input type='keyboard' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index c4b22f6..fdd7c7d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -51,7 +51,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 17d4016..42d529c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -44,7 +44,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index 20a0d76..5e26804 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -47,7 +47,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index 13fb299..f6af578 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -47,7 +47,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index 1380426..aba6045 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -44,7 +44,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index 64111fe..22e2035 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -45,7 +45,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index f362aee..aa5122b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -49,7 +49,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index 4d3bdde..bcccb94 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -56,7 +56,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index d3eaf82..82c41a6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -52,7 +52,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index 0f209d6..062f349 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -52,7 +52,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index b157f63..38a2fb3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -50,7 +50,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index d9cd840..4d76e34 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -52,7 +52,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index 2cffa65..e0f90ef 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -50,7 +50,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index 6e473d4..7de5731 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -50,7 +50,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index f03bd29..c22e2a5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -54,7 +54,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index 2e9c629..439a66e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -54,7 +54,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index 3f3f676..b4bdc8a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -54,7 +54,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index 4f28511..af9f928 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -52,7 +52,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index f934a85..d0240c4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -46,7 +46,7 @@ <sound model='sb16'/> <sound model='es1370'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index f934a85..d0240c4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -46,7 +46,7 @@ <sound model='sb16'/> <sound model='es1370'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index 8b5887e..e84e172 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -45,7 +45,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index 3e4b366..187d867 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -45,7 +45,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 9c2b9e3..2816f4a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -44,7 +44,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index 9c2b9e3..2816f4a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -44,7 +44,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 9c2b9e3..2816f4a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -44,7 +44,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 97d9482..41fb3b7 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -49,7 +49,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml index dbdacf9..72fec25 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml @@ -30,7 +30,7 @@ <listen type='address' address='0.0.0.0'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml index c415aab..0fd7a88 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml @@ -30,7 +30,7 @@ <listen type='address' address='0.0.0.0'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index c1acba1..ee24536 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -33,7 +33,7 @@ <input type='keyboard' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml index 45887e5..1ebd5f0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml @@ -48,7 +48,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml index 3d4868c..41e8804 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml index 402f479..6578e59 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml index 686a409..3738c8e 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml @@ -49,7 +49,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml index 686a409..3738c8e 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml @@ -49,7 +49,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml index 686a409..3738c8e 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml @@ -49,7 +49,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml index 5ec72c4..d7df23a 100644 --- a/tests/xlconfigdata/test-fullvirt-multiusb.xml +++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml @@ -48,7 +48,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml index a997c7a..9cd7b0b 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.xml +++ b/tests/xlconfigdata/test-fullvirt-nohap.xml @@ -56,7 +56,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml index 3d4868c..41e8804 100644 --- a/tests/xlconfigdata/test-new-disk.xml +++ b/tests/xlconfigdata/test-new-disk.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml index f8f663f..728aa1e 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml @@ -49,7 +49,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml index f9eb857..3820732 100644 --- a/tests/xlconfigdata/test-spice-features.xml +++ b/tests/xlconfigdata/test-spice-features.xml @@ -48,7 +48,7 @@ <clipboard copypaste='yes'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml index fc2fa3f..f33691f 100644 --- a/tests/xlconfigdata/test-spice.xml +++ b/tests/xlconfigdata/test-spice.xml @@ -48,7 +48,7 @@ <clipboard copypaste='no'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml index 0e13f2e..3620e2a 100644 --- a/tests/xlconfigdata/test-vif-rate.xml +++ b/tests/xlconfigdata/test-vif-rate.xml @@ -55,7 +55,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> </devices> </domain> diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 6373fdf..a5daa2c 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -54,7 +54,7 @@ <sound model='sb16'/> <sound model='es1370'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml index 6f4dae6..ce1280d 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -48,7 +48,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index 6f4dae6..ce1280d 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -48,7 +48,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index 6015405..7636f31 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -48,7 +48,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index 5f81e25..b3adf86 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -46,7 +46,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index cb0615b..c22ad8d 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -46,7 +46,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index d29892e..2bb3d72 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -46,7 +46,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml index f38366c..234856c 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.xml +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml @@ -47,7 +47,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index 3269aee..be149fd 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -51,7 +51,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml index a20d6c8..753043d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml @@ -58,7 +58,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml index 8344da3..a104c6f 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml @@ -54,7 +54,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index b9439d7..f27aba9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -54,7 +54,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index 6e8196b..ea29944 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index da0c9bd..69bf51c 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -54,7 +54,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index acff588..0c6e477 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index 6909053..1f12081 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -52,7 +52,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index a3fd449..47544df 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -56,7 +56,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 9dba76d..8f1777a 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -56,7 +56,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index 3577f92..c59e2b6 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -56,7 +56,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 919108b..e678786 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -54,7 +54,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index 0e85953..3bd2e76 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -48,7 +48,7 @@ <sound model='sb16'/> <sound model='es1370'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 8eb5aa5..f1421b6 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -47,7 +47,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index dcdd951..566c842 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -47,7 +47,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index d29892e..2bb3d72 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -46,7 +46,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index d4c2fd6..246123c 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -49,7 +49,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index ad44d11..735e8b0 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -33,7 +33,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml index e94b685..3ce3639 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -34,7 +34,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index 3ca3023..20c31ec 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -32,7 +32,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index d97799a..33c48f4 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -32,7 +32,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='xen' heads='1' primary='yes'/> + <model type='xen' vram='4096' heads='1' primary='yes'/> </video> <memballoon model='xen'/> </devices> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index 4c3f5f2..a88853d 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -49,7 +49,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <video> - <model type='cirrus' heads='1' primary='yes'/> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> </video> <hostdev mode='subsystem' type='pci' managed='no'> <source> -- 2.7.3

2 1

[libvirt] adding a new libvirt xml element for File Descriptor backed memory for use with vhost-user
by Mooney, Sean K 12 May '16

12 May '16

Hi I work mostly in OpenStack on enabling ovs with dpdk. When deploying vms on host running ovs with dpdk vms are booted utilizing Vhost-user interfaces. Qemu support creating vms with vhost-user network interfaces as of v2.1. Libvirt currently has support for requesting the use of vhost-user interfaces by added the following xml fragment <interface type='vhostuser'> <mac address='fa:16:3e:ea:2a:08'/> <source type='unix' path='/var/run/openvswitch/vhuf1204e0c-98' mode='client'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Send traffic via a vhost-user interface, the vhost-user frontend (provided by qemu) must share the virtios ring to the vhost-backed via passing a file descript to the memory backing object of the qemu instance as part of the port creation. Today the only native way to request Libvirt to create a vm who's memory is backed by a memdev which can be Accessed via a file descriptor is to request hugepage backed memory. This requires the operator to Manage and configure hugepage on each of their compute hosts and take special care to ensure that vms are Not placed on host were vhost-user interface are used if they do not request hugepages. Today it is possible to use Libvirt to spawn a vm without hugepage memory and a file descriptor backed memdev Via the use of the qemu:commandline element. <qemu:commandline> <qemu:arg value='-object'/> <qemu:arg value='memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,share=on'/> <qemu:arg value='-numa'/> <qemu:arg value='node,memdev=mem'/> <qemu:arg value='-mem-prealloc'/> </qemu:commandline> I created a proof of concept patch to nova to demonstrate that this works however to support this usecase in Nova a new xml element is required. https://review.openstack.org/#/c/309565/1 I would like to propose the introduction of a new subelemnt to the memorybacking element to request file discrptro backed memory <memoryBacking> <filedescriptor size_mb="1024" path="/var/lib/libvirt/qemu" prealloc="true" shared="on" /> </memoryBacking> The above filedescriptor xml fragment above would then be parsed to generate the same qemu argument as the qemu:commandline fragment Therefor allowing the creation of a vm with vhost-user interface without hugepage memory backing. Before I start looking at the Libvirt code base I wanted to ask if the Libvirt community would be open to this change and what would be the best way To approach enabling this feature. Regards Sean.

2 4

[libvirt] [PATCH] qemu: domain: Fix name of macro defining AES IV length
by Peter Krempa 12 May '16

12 May '16

The initialization vector is a technical term by itself different from the key. --- src/qemu/qemu_domain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 331ade0..dd90e67 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -254,8 +254,8 @@ struct _qemuDomainSecretPlain { char *secret; }; -# define QEMU_DOMAIN_AES_IV_KEY_LEN 16 /* 16 bytes for 128 bit random */ - /* initialization vector */ +# define QEMU_DOMAIN_AES_IV_LEN 16 /* 16 bytes for 128 bit random */ + /* initialization vector */ typedef struct _qemuDomainSecretAES qemuDomainSecretAES; typedef struct _qemuDomainSecretAES *qemuDomainSecretAESPtr; struct _qemuDomainSecretAES { -- 2.8.2

2 1

[libvirt] [PATCH 0/3] libxl: support Xen migration stream V2
by Jim Fehlig 12 May '16

12 May '16

Hi all, This patch adds support for Xen migration stream V2 to the libvirt libxl driver. In the process it fixes save/restore and migration tests in OSSTest, which have been failing since libvirt commit e7440656. Patch1 changes the libxl API requirement from version 4.2 to 4.4, enabling use of an extended libxl_domain_create_restore() function that allows passing restore parameters such as stream version. Patch2 adds support for migration stream V2 in the basic save/restore logic, taking advantage of a save image header that includes a version field. The version is set to '2' if the host produces a V2 migration stream. This patch fixes the failing save/restore tests in OSSTest. Patch3 adds support for migration stream V2 in the migration logic. The migration code does not use the save image header and instead uses libvirt's migration protocol to transfer domain configuration and other such goodies from source to destination. The patch enables sending version information in the Begin and Prepare migration phases so the correct stream version information can be passed to libxl_domain_create_restore(). An upshot of this approach is safely detecting and aborting a migration from a V2 host to a V1-only host. This patch fixes the failing migration tests in OSSTest. Jim Fehlig (3): libxl: switch to using libxl_domain_create_restore from v4.4 API libxl: support Xen migration stream V2 in save/restore libxl: support migration stream V2 in migration configure.ac | 9 +- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_domain.c | 46 ++++++++-- src/libxl/libxl_domain.h | 14 ++- src/libxl/libxl_driver.c | 27 +++--- src/libxl/libxl_migration.c | 204 +++++++++++++++++++++++++++++++++++++++++++- src/libxl/libxl_migration.h | 6 +- 7 files changed, 282 insertions(+), 30 deletions(-) -- 2.1.4

5 13

[libvirt] [PATCH] libxl: fix default vram setting for implicit video device
by Jim Fehlig 12 May '16

12 May '16

Commit 6879be48 moved adding of an implicit video device after XML parsing. As a result, libxlDomainDeviceDefPostParse() is no longer called to set the default vram when adding an implicit device. Commit 6879be48 assumes virDomainVideoDefaultRAM() will set the default vram, but it returns 0 if the domain virtType is VIR_DOMAIN_VIRT_XEN. Attempting to start an HVM domain with vram=0 results in error: unsupported configuration: videoram must be at least 4MB for CIRRUS The default vram setting for Xen HVM domains depends on the device model used (qemu-xen vs qemu-traditional), hence setting the default is deferred to libxlDomainDeviceDefPostParse(). This patch addresses the problem during creation of the video device. If vram is 0, it is assumed unset and the default (depending on qemu-xen vs qemu-traditional) is applied. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1334557 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d927b37..1973ded 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1916,6 +1916,40 @@ libxlMakePCIList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; } +static unsigned int +libxlVideoDefaultRAM(const virDomainVideoType type, int dm_type) +{ + unsigned int ret = 0; + + switch (type) { + case VIR_DOMAIN_VIDEO_TYPE_VGA: + case VIR_DOMAIN_VIDEO_TYPE_XEN: + if (dm_type == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) + ret = 16 * 1024; + else + ret = 8 * 1024; + break; + + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + if (dm_type == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) + ret = 8 * 1024; + else + ret = 4 * 1024; + break; + +#ifdef LIBXL_HAVE_QXL + case VIR_DOMAIN_VIDEO_TYPE_QXL: + ret = 128 * 1024; + break; +#endif + + default: + break; + } + + return ret; +} + static int libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) @@ -1931,6 +1965,10 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) * on the first graphics device (display). */ if (def->nvideos) { + if (def->videos[0]->vram == 0) + def->videos[0]->vram = libxlVideoDefaultRAM(def->videos[0]->type, + dm_type); + switch (def->videos[0]->type) { case VIR_DOMAIN_VIDEO_TYPE_VGA: case VIR_DOMAIN_VIDEO_TYPE_XEN: -- 2.1.4

3 4

Re: [libvirt] [RFC 12/42] pc: initialize legacy hotplug only for 2.6 and older machine types
by Eduardo Habkost 12 May '16

12 May '16

On Thu, May 12, 2016 at 12:29:55PM +0200, Igor Mammedov wrote: > On Thu, 12 May 2016 10:07:03 +0300 > "Michael S. Tsirkin" <mst(a)redhat.com> wrote: > > > On Wed, May 11, 2016 at 08:28:59PM -0300, Eduardo Habkost wrote: > > > On Thu, May 12, 2016 at 12:51:55AM +0300, Michael S. Tsirkin wrote: > > > > On Wed, May 11, 2016 at 03:50:39PM +0200, Igor Mammedov wrote: > > > > > On Tue, 10 May 2016 17:24:14 -0300 > > > > > Eduardo Habkost <ehabkost(a)redhat.com> wrote: > > > > > > > > > > > On Mon, May 02, 2016 at 02:33:21PM +0200, Igor Mammedov wrote: > > > > > > > on old machine types CPU hotplug was uncondtionally > > > > > > > enabled since it was introduced, consuming IO ports > > > > > > > and providing AML regardles of whether it was actually > > > > > > > in use or not. Keep it so for 2.6 and older machines. > > > > > > > > > > > > > > New machine types will have an option to turn CPU > > > > > > > hotplug on if it's needed while by default it stays > > > > > > > disabled not consuming extra RAM/IO resources. > > > > > > > > > > > > > > Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> > > > > > > > > > > > > What if people are using "-machine pc -smp N,max_cpus=M"? > > > > > > Shouldn't we at least warning about missing CPU hotplug support > > > > > > when using just "max_cpus" with no "cpu-hotplug=on" with pc-2.7 > > > > > > and newer? > > > > > Yep, I'll add it on next respin. > > > > > Would hard error better than warning? > > > > > > > > Most people don't need cpu hotplug, attempts > > > > to hotplug fail, should be enough. > > > > > > People who don't need CPU hotplug shouldn't be using the max_cpus > > > option. > > > > I agree. > > > > > I believe we should at least warn people (early, during > > > initialization) that their configuration don't make sense > > > anymore. > > > > I think we should try to keep old command line working > > if we can. > this patch won't break old command line for old machine types, > but for new machine type users would need to fix it > and be explicit if they want cpu-hotplug. I don't think we should do that, unless users already had time to update their scripts and libvirt had time to implement code supporting the new method. I believe libvirt (and people's scripts) use maxcpus only when they want CPU hotplug, so making max_cpus > smp_cpus enable CPU hotplug implicitly would probably solve the compatibility issue. If we want to deprecate the use of maxcpus to enable CPU hotplug, then we can make it print a warning for a few releases, so people have time to update their code. -- Eduardo

3 4

[libvirt] [PATCH 1/2] tests: Adding <backenddomain/> option for xml2sexpr-net-bridge data test.
by Julio Faracco 12 May '16

12 May '16

There is no XML data file that is using <backenddomain/> option for network. It is a good opportunity to test/check this option for Xen. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml index d995d19..aec2c0d 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml +++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml @@ -22,6 +22,7 @@ <source bridge="xenbr2"/> <script path="vif-bridge"/> <target dev="vif4.0"/> + <backenddomain name='pvtest'/> </interface> <console tty='/dev/pts/4'/> </devices> -- 1.9.1

1 1

[libvirt] [PATCH 0/3] Secrets adjustments
by John Ferlan 12 May '16

12 May '16

Fallout from review of v3 of the IV Secrets: http://www.redhat.com/archives/libvir-list/2016-May/msg00444.html Add a new buffer escape API to handle printing a sized buffer Alter the existing fetch, store, and printing of the secret to be a "uint8_t *" rather than "(unsigned) char *". Change the name of SecretIV to SecretAES Figured I'd work through the getting the naming right first... John Ferlan (3): util: Introduce virBufferEscapeSizedBuf secret: Alter virSecretGetSecretString qemu: Change from SecretIV or _IV to SecretAES or _AES src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 18 +++++++++------- src/qemu/qemu_command.c | 11 +++++----- src/qemu/qemu_domain.c | 11 +++++----- src/qemu/qemu_domain.h | 17 ++++++++------- src/secret/secret_util.c | 19 +++++++++++++---- src/secret/secret_util.h | 13 ++++++------ src/util/virbuffer.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virbuffer.h | 3 +++ 9 files changed, 112 insertions(+), 35 deletions(-) -- 2.5.5

2 8