June 2014 - Devel - libvirt List Archives

[libvirt] [PATCH] Fix crash when saving a domain with type none dac label
by Ján Tomko 12 Jun '14

12 Jun '14

qemuDomainGetImageIds did not check if there was a label in the seclabel, thus crashing on <seclabel type='none' model='dac'/> --- src/qemu/qemu_domain.c | 3 ++- src/qemu/qemu_driver.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 962698b..e40c5ec 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2409,7 +2409,8 @@ qemuDomainGetImageIds(virQEMUDriverConfigPtr cfg, *gid = cfg->group; } - if (vm && (vmlabel = virDomainDefGetSecurityLabelDef(vm->def, "dac"))) + if (vm && (vmlabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")) && + vmlabel->label) virParseOwnershipIds(vmlabel->label, uid, gid); if ((disklabel = virDomainDiskDefGetSecurityLabelDef(disk, "dac")) && diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec72d9d..e147d28 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2771,6 +2771,7 @@ qemuOpenFile(virQEMUDriverPtr driver, /* TODO: Take imagelabel into account? */ if (vm && (seclabel = virDomainDefGetSecurityLabelDef(vm->def, "dac")) != NULL && + seclabel->label != NULL && (virParseOwnershipIds(seclabel->label, &user, &group) < 0)) goto cleanup; -- 1.8.5.5

2 1

[libvirt] [libvirt-glib PATCH v2] Add API to get security models from host capabilities
by Cédric Bosdonnat 12 Jun '14

12 Jun '14

--- Diff to v1: * GVirConfigCapabilitiesSecmodel -> GVirConfigCapabilitiesHostSecModel * Added gvir_config_capabilities_host_secmodel_get_doi libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-capabilities-host-secmodel.c | 62 +++++++++++++++++++ .../libvirt-gconfig-capabilities-host-secmodel.h | 69 ++++++++++++++++++++++ .../libvirt-gconfig-capabilities-host.c | 51 ++++++++++++++++ .../libvirt-gconfig-capabilities-host.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 6 ++ libvirt-gconfig/tests/test-capabilities-parse.c | 15 ++++- libvirt-gconfig/tests/test-capabilities-parse.xml | 4 ++ 9 files changed, 212 insertions(+), 1 deletion(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c create mode 100644 libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 83d521f..8a3ff0d 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -20,6 +20,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-capabilities-guest-arch.h \ libvirt-gconfig-capabilities-guest-domain.h \ libvirt-gconfig-capabilities-guest-feature.h \ + libvirt-gconfig-capabilities-host-secmodel.h \ libvirt-gconfig-domain.h \ libvirt-gconfig-domain-address.h \ libvirt-gconfig-domain-address-pci.h \ @@ -107,6 +108,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-capabilities-guest-arch.c \ libvirt-gconfig-capabilities-guest-domain.c \ libvirt-gconfig-capabilities-guest-feature.c \ + libvirt-gconfig-capabilities-host-secmodel.c \ libvirt-gconfig-domain.c \ libvirt-gconfig-domain-address.c \ libvirt-gconfig-domain-address-pci.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c new file mode 100644 index 0000000..9cbb585 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.c @@ -0,0 +1,62 @@ +/* + * libvirt-gconfig-capabilities-host-secmodel.c: libvirt security model capabilities + * + * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL, GVirConfigCapabilitiesHostSecModelPrivate)) + +struct _GVirConfigCapabilitiesHostSecModelPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigCapabilitiesHostSecModel, gvir_config_capabilities_host_secmodel, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_capabilities_host_secmodel_class_init(GVirConfigCapabilitiesHostSecModelClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesHostSecModelPrivate)); +} + +static void gvir_config_capabilities_host_secmodel_init(GVirConfigCapabilitiesHostSecModel *secmodel) +{ + g_debug("Init GVirConfigCapabilitiesHostSecModel=%p", secmodel); + + secmodel->priv = GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL_GET_PRIVATE(secmodel); +} + +const gchar * +gvir_config_capabilities_host_secmodel_get_model(GVirConfigCapabilitiesHostSecModel *secmodel) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(secmodel), + "model"); +} + +const gchar * +gvir_config_capabilities_host_secmodel_get_doi(GVirConfigCapabilitiesHostSecModel *secmodel) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(secmodel), + "doi"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.h b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.h new file mode 100644 index 0000000..1606571 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.h @@ -0,0 +1,69 @@ +/* + * libvirt-gconfig-capabilities-host-secmodel.h: libvirt security model capabilities + * + * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_CAPABILITIES_HOST_SECMODEL_H__ +#define __LIBVIRT_GCONFIG_CAPABILITIES_HOST_SECMODEL_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL (gvir_config_capabilities_host_secmodel_get_type ()) +#define GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL, GVirConfigCapabilitiesHostSecModel)) +#define GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL, GVirConfigCapabilitiesHostSecModelClass)) +#define GVIR_CONFIG_IS_CAPABILITIES_HOST_SECMODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL)) +#define GVIR_CONFIG_IS_CAPABILITIES_HOST_SECMODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL)) +#define GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL, GVirConfigCapabilitiesHostSecModelClass)) + +typedef struct _GVirConfigCapabilitiesHostSecModel GVirConfigCapabilitiesHostSecModel; +typedef struct _GVirConfigCapabilitiesHostSecModelPrivate GVirConfigCapabilitiesHostSecModelPrivate; +typedef struct _GVirConfigCapabilitiesHostSecModelClass GVirConfigCapabilitiesHostSecModelClass; + +struct _GVirConfigCapabilitiesHostSecModel +{ + GVirConfigObject parent; + + GVirConfigCapabilitiesHostSecModelPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigCapabilitiesHostSecModelClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_capabilities_host_secmodel_get_type(void); + +const gchar * +gvir_config_capabilities_host_secmodel_get_model(GVirConfigCapabilitiesHostSecModel *secmodel); + +const gchar * +gvir_config_capabilities_host_secmodel_get_doi(GVirConfigCapabilitiesHostSecModel *secmodel); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_CAPABILITIES_HOST_SECMODEL_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c index 6a15206..07719d0 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c @@ -77,3 +77,54 @@ gvir_config_capabilities_host_get_cpu(GVirConfigCapabilitiesHost *host) return GVIR_CONFIG_CAPABILITIES_CPU(object); } + +struct GetSecModelData { + GVirConfigXmlDoc *doc; + const gchar *schema; + GList *secmodels; + GType type; +}; + +static gboolean add_secmodel(xmlNodePtr node, gpointer opaque) +{ + struct GetSecModelData* data = (struct GetSecModelData*)opaque; + GVirConfigObject *secmodel; + + if (g_strcmp0((const gchar *)node->name, "secmodel") != 0) + return TRUE; + + secmodel = gvir_config_object_new_from_tree + (data->type, + data->doc, + data->schema, + node); + if (secmodel != NULL) + data->secmodels = g_list_append(data->secmodels, secmodel); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +GList * +gvir_config_capabilities_host_get_secmodels(GVirConfigCapabilitiesHost *host) +{ + struct GetSecModelData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_CAPABILITIES_HOST(host), NULL); + + data.schema = gvir_config_object_get_schema(GVIR_CONFIG_OBJECT(host)); + g_object_get(G_OBJECT(host), "doc", &data.doc, NULL); + g_return_val_if_fail(data.doc != NULL, NULL); + data.secmodels = NULL; + data.type = GVIR_CONFIG_TYPE_CAPABILITIES_HOST_SECMODEL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(host), + NULL, + add_secmodel, + &data); + + g_clear_object(&data.doc); + + return data.secmodels; +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.h b/libvirt-gconfig/libvirt-gconfig-capabilities-host.h index 34fbb4f..c3c7951 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.h @@ -67,6 +67,9 @@ gvir_config_capabilities_host_get_uuid(GVirConfigCapabilitiesHost *host); GVirConfigCapabilitiesCpu * gvir_config_capabilities_host_get_cpu(GVirConfigCapabilitiesHost *host); +GList * +gvir_config_capabilities_host_get_secmodels(GVirConfigCapabilitiesHost *host); + G_END_DECLS #endif /* __LIBVIRT_GCONFIG_CAPABILITIES_HOST_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 1582109..b494154 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -37,6 +37,7 @@ #include <libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.h> #include <libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.h> #include <libvirt-gconfig/libvirt-gconfig-capabilities-host.h> +#include <libvirt-gconfig/libvirt-gconfig-capabilities-host-secmodel.h> #include <libvirt-gconfig/libvirt-gconfig-domain.h> #include <libvirt-gconfig/libvirt-gconfig-domain-address.h> #include <libvirt-gconfig/libvirt-gconfig-domain-address-pci.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index fc68050..0d33fdb 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -689,6 +689,12 @@ global: LIBVIRT_GCONFIG_0.1.9 { global: + gvir_config_capabilities_host_get_secmodels; + + gvir_config_capabilities_host_secmodel_get_doi; + gvir_config_capabilities_host_secmodel_get_model; + gvir_config_capabilities_host_secmodel_get_type; + gvir_config_domain_chardev_source_spiceport_get_channel; gvir_config_domain_chardev_source_spiceport_get_type; gvir_config_domain_chardev_source_spiceport_new; diff --git a/libvirt-gconfig/tests/test-capabilities-parse.c b/libvirt-gconfig/tests/test-capabilities-parse.c index 8ede160..fdf41b6 100644 --- a/libvirt-gconfig/tests/test-capabilities-parse.c +++ b/libvirt-gconfig/tests/test-capabilities-parse.c @@ -35,7 +35,7 @@ static void verify_host_caps(GVirConfigCapabilitiesHost *host_caps) { GVirConfigCapabilitiesCpu *cpu_caps; GVirConfigCapabilitiesCpuTopology *topology; - GList *features, *iter; + GList *features, *iter, *secmodels; const char *str; g_assert(host_caps != NULL); @@ -60,6 +60,19 @@ static void verify_host_caps(GVirConfigCapabilitiesHost *host_caps) g_assert(gvir_config_capabilities_cpu_topology_get_threads(topology) == 2); g_object_unref(G_OBJECT(topology)); g_object_unref(G_OBJECT(cpu_caps)); + + secmodels = gvir_config_capabilities_host_get_secmodels(host_caps); + g_assert(g_list_length(secmodels) == 2); + for (iter = secmodels; iter != NULL; iter = iter->next) { + GVirConfigCapabilitiesHostSecModel *secmodel; + + g_assert(iter->data != NULL); + secmodel = GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL(iter->data); + g_assert(gvir_config_capabilities_host_secmodel_get_model(secmodel) != NULL); + g_assert(gvir_config_capabilities_host_secmodel_get_doi(secmodel) != NULL); + g_object_unref(G_OBJECT(iter->data)); + } + g_list_free(secmodels); } static void verify_guest_caps(GVirConfigCapabilitiesGuest *guest_caps) diff --git a/libvirt-gconfig/tests/test-capabilities-parse.xml b/libvirt-gconfig/tests/test-capabilities-parse.xml index 9c76085..477e3fe 100644 --- a/libvirt-gconfig/tests/test-capabilities-parse.xml +++ b/libvirt-gconfig/tests/test-capabilities-parse.xml @@ -40,6 +40,10 @@ <model>selinux</model> <doi>0</doi> </secmodel> + <secmodel> + <model>apparmor</model> + <doi>0</doi> + </secmodel> </host> <guest> -- 1.8.4.5

1 0

[libvirt] [PATCH 0/2] storage: Fix error messages containing UUIDs
by Peter Krempa 12 Jun '14

12 Jun '14

Peter Krempa (2): storage: pool: Fix handling of errors on pool lookup failure storage: volume: Rework lookup of volume objects src/storage/storage_driver.c | 555 +++++++++++++------------------------------ 1 file changed, 159 insertions(+), 396 deletions(-) -- 1.9.3

2 6

[libvirt] [PATCH RFC 3/3] docs: add description for vgamem attribute
by Wangrui (K) 12 Jun '14

12 Jun '14

Enhance schema and add description for vgamem attribute. Signed-off-by: Zeng Junliang <zengjunliang(a)huawei.com> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- docs/formatdomain.html.in | 24 ++++++++++++++++++------ docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1b6ced8..72796ec 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4263,7 +4263,8 @@ qemu-kvm -net nic,model=? /dev/null will add a default <code>video</code> according to the guest type. For a guest of type "kvm", the default <code>video</code> for it is: <code>type</code> with value "cirrus", <code>vram</code> with value - "9216", and <code>heads</code> with value "1". By default, the first + "9216", <code>vgamem</code> (<span class="since">since 1.2.6</span>) with + value "16384", and <code>heads</code> with value "1". By default, the first video device in domain xml is the primary one, but the optional attribute <code>primary</code> (<span class="since">since 1.0.2</span>) with value 'yes' can be used to mark the primary in cases of multiple @@ -4271,8 +4272,8 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies the size of the primary bar, while <code>vram</code> specifies the - secondary bar size. If "ram" or "vram" are not supplied a default - value is used. + secondary bar size. If "ram", "vram" or "vgamem" are not supplied + a default value is used. </dd> <dt><code>model</code></dt> @@ -4281,9 +4282,20 @@ qemu-kvm -net nic,model=? /dev/null attribute which takes the value "vga", "cirrus", "vmvga", "xen", "vbox", or "qxl" (<span class="since">since 0.8.6</span>) depending on the hypervisor features available. - You can also provide the amount of video memory in kibibytes - (blocks of 1024 bytes) using - <code>vram</code> and the number of screen with <code>heads</code>. + <p> + <code>vram</code> attribute specifies the amount of video memory + in kibibytes (blocks of 1024 bytes). For a guest type of "kvm", + it is only valid when type is "qxl". + </p> + <p> + <code>vgamem</code> attribute <span class="since">since 1.2.6, + QEMU and KVM only</span> specifies the size of the framebuffer + portion of the "ram" region. + And it is not valid when type is "xen" and "vbox". + </p> + <p> + <code>heads</code> attribute specifies the number of screen. + </p> </dd> <dt><code>acceleration</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6cc922c..a3f2e60 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2698,6 +2698,11 @@ </attribute> </optional> <optional> + <attribute name="vgamem"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> <attribute name="heads"> <ref name="unsignedInt"/> </attribute> -- 1.7.12.4

1 0

[libvirt] [PATCH RFC 2/3] tests: modify test case related to vgamem attribute
by Wangrui (K) 12 Jun '14

12 Jun '14

This patch modify test case related to vgamem attribute. Signed-off-by: Zeng Junliang <zengjunliang(a)huawei.com> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- tests/domainschemadata/domain-parallels-ct-simple.xml | 2 +- tests/domainschemadata/domain-parallels-vm-simple.xml | 2 +- .../qemuhotplug-console-compat-2+console-virtio.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- .../qemuxml2argv-graphics-spice-agent-file-xfer.args | 5 +++-- .../qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 4 +++- .../qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml | 4 ++-- .../qemuxml2argv-graphics-spice-listen-network.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args | 5 +++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 9 ++++++--- .../qemuxml2argv-video-device-pciaddr-default.xml | 6 +++--- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml | 2 +- tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-svga.xml | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml | 2 +- 51 files changed, 74 insertions(+), 62 deletions(-) diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml index a2b87ce..2a5daf6 100644 --- a/tests/domainschemadata/domain-parallels-ct-simple.xml +++ b/tests/domainschemadata/domain-parallels-ct-simple.xml @@ -19,7 +19,7 @@ <target dir='/'/> </filesystem> <video> - <model type='vga' vram='16777216' heads='1'> + <model type='vga' vram='16777216' vgamem='16384' heads='1'> <acceleration accel3d='no' accel2d='no'/> </model> </video> diff --git a/tests/domainschemadata/domain-parallels-vm-simple.xml b/tests/domainschemadata/domain-parallels-vm-simple.xml index 4e21583..ca93373 100644 --- a/tests/domainschemadata/domain-parallels-vm-simple.xml +++ b/tests/domainschemadata/domain-parallels-vm-simple.xml @@ -18,7 +18,7 @@ <target dev='hda'/> </disk> <video> - <model type='vga' vram='33554432' heads='1'> + <model type='vga' vram='33554432' vgamem='16384' heads='1'> <acceleration accel3d='no' accel2d='no'/> </model> </video> diff --git a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml index ec1c6e8..714b466 100644 --- a/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml +++ b/tests/qemuhotplugtestdata/qemuhotplug-console-compat-2+console-virtio.xml @@ -91,7 +91,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml index 4d4ac47..112d2f1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-2.xml @@ -88,7 +88,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml index 6a98eaa..594d1da 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-controller-order.xml @@ -73,7 +73,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </sound> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <hostdev mode='subsystem' type='usb' managed='yes'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml index 98b7d6a..3ae1db8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml @@ -28,7 +28,7 @@ <listen type='network' network='Bobsnetwork'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml index aa458d7..2a57363 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml @@ -28,7 +28,7 @@ <listen type='network' network='Bobsnetwork'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 4aa385c..2ffe22d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -27,7 +27,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='yes'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index 66ea35d..0512aa4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -27,7 +27,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority'/> <video> - <model type='vga' vram='9216' heads='1'/> + <model type='vga' vram='9216' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args index 66f22bc..041d3af 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args @@ -4,6 +4,7 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\ disable-agent-file-xfer -vga qxl -global qxl-vga.ram_size=67108864 \ --global qxl-vga.vram_size=33554432 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-global qxl-vga.vram_size=33554432 -global qxl-vga.vgamem_mb=16 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,\ +vgamem_mb=16,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml index 3a3e366..2574feb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml @@ -30,10 +30,10 @@ <filetransfer enable='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='65536' heads='1'/> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml index 113a236..5d7758c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.xml @@ -32,7 +32,7 @@ <address type='virtio-serial' controller='1' bus='0' port='3'/> </channel> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 59f064b..9ebd697 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -7,5 +7,7 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter -vga \ qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.vgamem_mb=16 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,\ +vgamem_mb=16,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index 6c913b4..8163020 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -33,10 +33,10 @@ <streaming mode='filter'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml index 34971fe..c0ad87c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-listen-network.xml @@ -35,10 +35,10 @@ <channel mode='secure' name='usbredir'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index ef499e6..1d88655 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -4,5 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-global qxl-vga.vgamem_mb=16 -device qxl,id=video1,ram_size=67108864,\ +vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index acf3019..a12206b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -30,10 +30,10 @@ <channel name='inputs' mode='insecure'/> </graphics> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='65536' heads='1'/> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args index 8847bce..614fada 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -6,4 +6,5 @@ SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=spice \ -spice port=5903,tls-port=5904,sasl,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=default \ -vga qxl -global qxl.ram_size=67108864 -global \ -qxl.vram_size=18874368 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 +qxl.vram_size=18874368 -global qxl.vgamem_mb=16 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml index eb630fa..2181f8e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml @@ -28,7 +28,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml index e6ecbed..c228f61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml @@ -77,7 +77,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </sound> <video> - <model type='vga' vram='9216' heads='1'/> + <model type='vga' vram='9216' vgamem='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 8430d9c..7c843ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -8,6 +8,7 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter,disable-copy-paste,\ disable-agent-file-xfer -vga qxl -global qxl.ram_size=67108864 \ --global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.vram_size=18874368 -global qxl.vgamem_mb=16 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,\ +vgamem_mb=16,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 8f58149..9396056 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -37,10 +37,10 @@ <filetransfer enable='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml index 0198930..68d2311 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml @@ -29,7 +29,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index eda2e87..7718070 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -29,7 +29,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index 2b13865..213360c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -27,7 +27,7 @@ <input type='keyboard' bus='ps2'/> <graphics type='vnc' socket='/tmp/foo.socket'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index eda2e87..7718070 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -29,7 +29,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml index 11e5a7a..2b1a5f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml @@ -22,7 +22,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index 267876f..0308703 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -29,7 +29,7 @@ <listen type='address' address='2001:1:2:3:4:5:1234:1234'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml index f70e20a..7a4d8b4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml @@ -66,7 +66,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </sound> <video> - <model type='vga' vram='9216' heads='1'/> + <model type='vga' vram='9216' vgamem='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml index 92db5e6..5c7e0a6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.xml @@ -34,7 +34,7 @@ </controller> <input type='mouse' bus='ps2'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml index f6a3ddf..dfe2a95 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.xml @@ -35,7 +35,7 @@ <controller type='pci' index='8' model='pci-bridge'/> <input type='mouse' bus='ps2'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml index a1cb38c..d09afed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml @@ -201,7 +201,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args index 6855cd2..8c5f01a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args @@ -6,4 +6,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 +-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ +-global qxl.vgamem_mb=16 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml index ee151be..68f78a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml @@ -26,7 +26,7 @@ <controller type='pci' index='2' model='pci-bridge'/> <controller type='sata' index='0'/> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml index 64b70f3..7e37de4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-disk.xml @@ -34,7 +34,7 @@ <input type='mouse' bus='usb'/> <graphics type='sdl'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.args b/tests/qemuxml2argvdata/qemuxml2argv-q35.args index 8cc5874..f74bc01 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.args @@ -5,4 +5,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-sata0-0-0 \ -device ide-drive,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0 \ --vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 +-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ +-global qxl.vgamem_mb=16 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml b/tests/qemuxml2argvdata/qemuxml2argv-q35.xml index edaf6cb..478d23f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-q35.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35.xml @@ -23,7 +23,7 @@ <controller type='pci' index='1' model='dmi-to-pci-bridge'/> <controller type='pci' index='2' model='pci-bridge'/> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args index 8c631b1..476f883 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args @@ -9,5 +9,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ -device usb-tablet,id=input0 \ -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice \ -device \ -qxl-vga,id=video0,ram_size=67107840,vram_size=67107840,bus=pci.0,addr=0x2 \ +qxl-vga,id=video0,ram_size=67107840,vram_size=67107840,\ +vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml index 36af468..47fabe9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.xml @@ -37,7 +37,7 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='qxl' ram='65535' vram='65535' heads='1'/> + <model type='qxl' ram='65535' vram='65535' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 4abd7c2..801aa7a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -3,7 +3,10 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -usb \ -hda /var/lib/libvirt/images/QEMUGuest1 -vnc 127.0.0.1:-5900 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ --device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,\ +vgamem_mb=16,bus=pci.0,addr=0x3 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,\ +vgamem_mb=16,bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,\ +vgamem_mb=16,bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml index 120e7f4..c3f5bcc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.xml @@ -29,13 +29,13 @@ <listen type='address' address='127.0.0.1'/> </graphics> <video> - <model type='qxl' vram='65536' heads='1'/> + <model type='qxl' vram='65536' vgamem='16384' heads='1'/> </video> <video> - <model type='qxl' vram='65536' heads='1' primary='yes'/> + <model type='qxl' vram='65536' vgamem='16384' heads='1' primary='yes'/> </video> <video> - <model type='qxl' vram='65536' heads='1'/> + <model type='qxl' vram='65536' vgamem='16384' heads='1'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml index ae40805..27bfbc5 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml @@ -29,7 +29,7 @@ <listen type='network' network='Bobsnetwork'/> </graphics> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml index 44c4cf7..aca4942 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml @@ -80,7 +80,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </sound> <video> - <model type='vga' vram='9216' heads='1'/> + <model type='vga' vram='9216' vgamem='16384' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml index 13f0f5d..53c34cd 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-addr.xml @@ -34,7 +34,7 @@ </controller> <controller type='pci' index='0' model='pci-root'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml index 8748437..92faa84 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autoadd-idx.xml @@ -35,7 +35,7 @@ <controller type='pci' index='8' model='pci-bridge'/> <controller type='pci' index='0' model='pci-root'/> <video> - <model type='cirrus' vram='9216' heads='1'/> + <model type='cirrus' vram='9216' vgamem='8192' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml index 96f8eaf..aa24cc8 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml @@ -24,7 +24,7 @@ <controller type='pci' index='2' model='pci-bridge'/> <controller type='sata' index='0'/> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' vgamem='16384' heads='1'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml index fa416a9..9444193 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml @@ -30,7 +30,7 @@ <model type='vmxnet3'/> </interface> <video> - <model type='vmvga' vram='8192'/> + <model type='vmvga' vram='8192' vgamem='16384'/> </video> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml index 0bfc7e8..530da8d 100644 --- a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml +++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml @@ -34,7 +34,7 @@ <source bridge=''/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' vgamem='16384'/> </video> <memballoon model='none'/> </devices> diff --git a/tests/xml2vmxdata/xml2vmx-svga.xml b/tests/xml2vmxdata/xml2vmx-svga.xml index 1148848..44e9546 100644 --- a/tests/xml2vmxdata/xml2vmx-svga.xml +++ b/tests/xml2vmxdata/xml2vmx-svga.xml @@ -7,7 +7,7 @@ </os> <devices> <video> - <model type='vmvga' vram='8192'/> + <model type='vmvga' vram='8192' vgamem='16384'/> </video> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml index eab25d8..bf8df38 100644 --- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml +++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml @@ -23,7 +23,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' vgamem='16384'/> </video> </devices> </domain> diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml index 30fb76c..5701c2c 100644 --- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml +++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml @@ -24,7 +24,7 @@ <model type='e1000'/> </interface> <video> - <model type='vmvga' vram='4096'/> + <model type='vmvga' vram='4096' vgamem='16384'/> </video> </devices> </domain> -- 1.7.12.4

1 0

[libvirt] [PATCH RFC 1/3] qemu: Introduce vgamem attribute for video model
by Wangrui (K) 12 Jun '14

12 Jun '14

This patch introduces vgamem attribute for video model, and sets its default value as qemu used. Parse it in two ways accroding to qemu startup parameters supported: -device or -vga. Signed-off-by: Zeng Junliang <zengjunliang(a)huawei.com> Signed-off-by: Wang Rui <moon.wangrui(a)huawei.com> --- For KVM, vram attribute seems to be invalid for cirrus/vga/vmvga device. Should we replace vram with vgamem? Or any other plans for this vram attribute? src/conf/domain_conf.c | 44 ++++++++++++++++++++++++++- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 79 +++++++++++++++++++++++++++++++++--------------- 4 files changed, 100 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ff2d447..58f6ed6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9358,6 +9358,24 @@ virDomainVideoDefaultRAM(const virDomainDef *def, } } +int +virDomainVideoDefaultVgamem(int type) +{ + switch (type) { + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + /* QEMU use 8M as default value for cirrus device */ + return 8 * 1024; + + case VIR_DOMAIN_VIDEO_TYPE_VGA: + case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + case VIR_DOMAIN_VIDEO_TYPE_QXL: + /* QEMU use 16M as default value for vga/vmvga/qxl device*/ + return 16 * 1024; + + default: + return 0; + } +} int virDomainVideoDefaultType(const virDomainDef *def) @@ -9443,6 +9461,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, char *type = NULL; char *heads = NULL; char *vram = NULL; + char *vgamem = NULL; char *ram = NULL; char *primary = NULL; @@ -9452,11 +9471,12 @@ virDomainVideoDefParseXML(xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if (!type && !vram && !ram && !heads && + if (!type && !vram && !ram && !heads && !vgamem && xmlStrEqual(cur->name, BAD_CAST "model")) { type = virXMLPropString(cur, "type"); ram = virXMLPropString(cur, "ram"); vram = virXMLPropString(cur, "vram"); + vgamem = virXMLPropString(cur, "vgamem"); heads = virXMLPropString(cur, "heads"); if ((primary = virXMLPropString(cur, "primary")) != NULL) { @@ -9510,6 +9530,16 @@ virDomainVideoDefParseXML(xmlNodePtr node, def->vram = virDomainVideoDefaultRAM(dom, def->type); } + if (vgamem) { + if (virStrToLong_ui(vgamem, NULL, 10, &def->vgamem) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse video vgamem '%s'"), vgamem); + goto error; + } + } else { + def->vgamem = virDomainVideoDefaultVgamem(def->type); + } + if (heads) { if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -9526,6 +9556,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, VIR_FREE(type); VIR_FREE(ram); VIR_FREE(vram); + VIR_FREE(vgamem); VIR_FREE(heads); return def; @@ -9535,6 +9566,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, VIR_FREE(type); VIR_FREE(ram); VIR_FREE(vram); + VIR_FREE(vgamem); VIR_FREE(heads); return NULL; } @@ -12658,6 +12690,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } video->vram = virDomainVideoDefaultRAM(def, video->type); + video->vgamem = virDomainVideoDefaultVgamem(video->type); video->heads = 1; if (VIR_ALLOC_N(def->videos, 1) < 0) { virDomainVideoDefFree(video); @@ -13578,6 +13611,13 @@ virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src, return false; } + if (src->vgamem!= dst->vgamem) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target video card vgamem %u does not match source %u"), + dst->vgamem, src->vgamem); + return false; + } + if (src->heads != dst->heads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target video card heads %u does not match source %u"), @@ -16532,6 +16572,8 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " ram='%u'", def->ram); if (def->vram) virBufferAsprintf(buf, " vram='%u'", def->vram); + if (def->vgamem) + virBufferAsprintf(buf, " vgamem='%u'", def->vgamem); if (def->heads) virBufferAsprintf(buf, " heads='%u'", def->heads); if (def->primary) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a6ac95a..a72eeec 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1216,6 +1216,7 @@ struct _virDomainVideoDef { int type; unsigned int ram; /* kibibytes (multiples of 1024) */ unsigned int vram; /* kibibytes (multiples of 1024) */ + unsigned int vgamem; /* kibibytes (multiples of 1024) */ unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; @@ -2456,7 +2457,7 @@ virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i); int virDomainVideoDefaultType(const virDomainDef *def); int virDomainVideoDefaultRAM(const virDomainDef *def, int type); - +int virDomainVideoDefaultVgamem(int type); int virDomainObjListNumOfDomains(virDomainObjListPtr doms, bool active, virDomainObjListFilter filter, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 122c572..d8beed5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -421,6 +421,7 @@ virDomainVcpuPinDel; virDomainVcpuPinFindByVcpu; virDomainVcpuPinIsDuplicate; virDomainVideoDefaultRAM; +virDomainVideoDefaultVgamem; virDomainVideoDefaultType; virDomainVideoDefFree; virDomainVideoTypeFromString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2caee66..2442ebd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4931,6 +4931,11 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); } + /* QEMU accepts MByte for vgamem_mb and ensure its value + * a power of two and range: 1 MB -> 256 MB */ + virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); + + if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) goto error; @@ -8659,36 +8664,59 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-vga", vgastr, NULL); - if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL && - (def->videos[0]->vram || def->videos[0]->ram) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - const char *dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA) - ? "qxl-vga" : "qxl"); - int ram = def->videos[0]->ram; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { + const char *dev = NULL; + int ram = def->videos[0]->ram; int vram = def->videos[0]->vram; + switch (primaryVideoType) { + case VIR_DOMAIN_VIDEO_TYPE_VGA: + dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA) + ? "VGA" : NULL); + break; + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA) + ? "cirrus-vga" : NULL); + break; + case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMWARE_SVGA) + ? "vmware-svga" : NULL); + break; + case VIR_DOMAIN_VIDEO_TYPE_QXL: + dev = (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA) + ? "qxl-vga" : "qxl"); + if (vram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_OVERFLOW, + _("value for 'vram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + if (ram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_OVERFLOW, + _("value for 'ram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } - if (vram > (UINT_MAX / 1024)) { - virReportError(VIR_ERR_OVERFLOW, - _("value for 'vram' must be less than '%u'"), - UINT_MAX / 1024); - goto error; - } - if (ram > (UINT_MAX / 1024)) { - virReportError(VIR_ERR_OVERFLOW, - _("value for 'ram' must be less than '%u'"), - UINT_MAX / 1024); - goto error; - } + if (ram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.ram_size=%u", + dev, ram * 1024); + } + if (vram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.vram_size=%u", + dev, vram * 1024); + } - if (ram) { - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.ram_size=%u", - dev, ram * 1024); + break; } - if (vram) { + + if (dev) { + /* QEMU accepts MByte for vgamem_mb and ensure its value + * a power of two and range: 1 MB -> 256 MB */ virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "%s.vram_size=%u", - dev, vram * 1024); + virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u", + dev, def->videos[0]->vgamem / 1024); } } } @@ -11640,6 +11668,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, else vid->type = video; vid->vram = virDomainVideoDefaultRAM(def, vid->type); + vid->vgamem = virDomainVideoDefaultVgamem(vid->type); vid->ram = vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL ? virDomainVideoDefaultRAM(def, vid->type) : 0; vid->heads = 1; -- 1.7.12.4

1 0

[libvirt] [PATCH] libxl: fix domxml-to-native wrong output for qcow2 format
by Bamvor Jian Zhang 12 Jun '14

12 Jun '14

e.g. for these following disk configuration in libvirt. <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/xen/images/001/disk0.qcow2'/> <target dev='hdc'/> without this patch, it will be "qemu:/var/lib/xen/images/001/disk0.qcow2,hdc,w" but it should be(if with this patch) "qcow2:/var/lib/xen/images/001/disk0.qcow2,hdc,w" Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- src/xenxs/xen_xm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index b2db97d..29835b4 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -1209,7 +1209,10 @@ xenFormatXMDisk(virConfValuePtr list, type = "aio"; else type = virStorageFileFormatTypeToString(format); - virBufferAsprintf(&buf, "%s:", driver); + if (!STREQ(type, "qcow2")) + virBufferAsprintf(&buf, "%s:", driver); + else + virBufferAsprintf(&buf, "%s:", type); if (STREQ(driver, "tap")) virBufferAsprintf(&buf, "%s:", type); } else { -- 1.8.1.4

1 0

[libvirt] [PATCH] virsh: include bhyve in virsh -V output
by Roman Bogorodskiy 12 Jun '14

12 Jun '14

Add 'Bhyve' in hypervisor list reported by 'virsh -V' if it's compiled it. --- tools/virsh.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 15f3025..828d585 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3233,6 +3233,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_XENAPI vshPrint(ctl, " XenAPI"); #endif +#ifdef WITH_BHYVE + vshPrint(ctl, " Bhyve"); +#endif #ifdef WITH_TEST vshPrint(ctl, " Test"); #endif -- 1.9.0

2 2

[libvirt] [PATCHv3 00/36] Network backed backing chains and block jobs
by Peter Krempa 12 Jun '14

12 Jun '14

First 7 patches of v2 are already pushed. First ~6 patches of this series were already ACKed, but can't be pushed due to the freeze and rebase conflicts of changing order of the patches. Thus I'm reposting them. Peter Krempa (36): storage: backend: Add unique id retrieval API storage: Add API to check accessibility of storage volumes storage: Move virStorageFileGetMetadata to the storage driver storage: Determine the local storage type right away test: storage: Initialize storage source to correct type storage: backend: Add possibility to suppress errors from backend lookup storage: Switch metadata crawler to use storage driver to get unique path storage: Switch metadata crawler to use storage driver to read headers storage: Switch metadata crawler to use storage driver file access check storage: Add infrastructure to parse remote network backing names storage: Change to new backing store parser storage: Traverse backing chains of network disks util: string: Return element count from virStringSplit util: string: Add helper to free non-NULL terminated string arrays util: storagefile: Add helper to resolve "../", "./" and "////" in paths util: storage: Add helper to resolve relative path difference util: storagefile: Add canonicalization to virStorageFileSimplifyPath storage: gluster: Add backend to return unique storage file path qemu: json: Add format strings for optional command arguments tests: storagetest: Unify and reformat storage chain format string tests: virstoragetest: Remove "expBackingStore" field tests: virstoragetest: Fix output when hitting errors storage: Store relative path only for relatively backed storage tests: virstoragetest: Remove now unused pathAbs util: storage: Remove now redundant backingRelative from virStorageSource tests: virstoragetest: Don't test relative start of backing chains tests: virstoragetest: Remove unneeded relative test plumbing storage: Don't canonicalize paths unnecessarily storage: Don't store parent directory of an image explicitly qemu: monitor: Add argument for specifying backing name for block commit qemu: monitor: Add support for backing name specification for block-stream lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: caps: Add capability for change-backing-file command qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase cfg.mk | 2 +- include/libvirt/libvirt.h.in | 6 + src/Makefile.am | 2 + src/libvirt_private.syms | 7 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_driver.c | 79 +++- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_monitor.c | 21 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 139 ++++-- src/qemu/qemu_monitor_json.h | 2 + src/security/virt-aa-helper.c | 2 + src/storage/storage_backend.c | 16 +- src/storage/storage_backend.h | 12 +- src/storage/storage_backend_fs.c | 62 +++ src/storage/storage_backend_gluster.c | 92 ++++ src/storage/storage_driver.c | 212 +++++++++ src/storage/storage_driver.h | 7 + src/util/virstoragefile.c | 822 +++++++++++++++++++++++----------- src/util/virstoragefile.h | 34 +- src/util/virstring.c | 44 +- src/util/virstring.h | 7 + tests/Makefile.am | 8 +- tests/qemumonitorjsontest.c | 2 +- tests/virstoragetest.c | 491 +++++++++++++------- tests/virstringtest.c | 14 +- tools/virsh-domain.c | 29 +- tools/virsh.pod | 10 +- 30 files changed, 1633 insertions(+), 512 deletions(-) -- 1.9.3

3 65

[libvirt] [PATCH] maint: exempt graphic binaries from syntax check
by Eric Blake 12 Jun '14

12 Jun '14

Roman Bogorodskiy reported a syntax-check failure when using FreeBSD; complaining that: prohibit_empty_first_line tools/libvirt_win_icon_16x16.ico:1: tools/libvirt_win_icon_32x32.ico:1: tools/libvirt_win_icon_48x48.ico:1: tools/libvirt_win_icon_64x64.ico:1: maint.mk: Prohibited empty first line In reality, the first 'line' of that file is NOT empty; but since it is a binary file, awk is not required to handle it gracefully. The simplest solution is to exempt all image files from syntax checks in the first place - after all, we only store them in git because they are inconvenient to regenerate, but they are not our preferred format for making modifications, and syntax check should only cover files that we are likely to modify. * cfg.mk (VC_LIST_ALWAYS_EXCLUDE_REGEX): Exempt images. (exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF): Simplify. (exclude_file_name_regexp--sc_trailing_blank): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index 10ad744..1f07639 100644 --- a/cfg.mk +++ b/cfg.mk @@ -90,7 +90,7 @@ endif # Files that should never cause syntax check failures. VC_LIST_ALWAYS_EXCLUDE_REGEX = \ - (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.po)$$ + (^(HACKING|docs/(news\.html\.in|.*\.patch))|\.(po|fig|gif|ico|png))$$ # Functions like free() that are no-ops on NULL arguments. useless_free_options = \ @@ -1047,7 +1047,7 @@ exclude_file_name_regexp--sc_prohibit_close = \ (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vir(cgroup|pci)mock\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ - (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.(gif|ico|png|diff)$$) + (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.diff$$) _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon) exclude_file_name_regexp--sc_prohibit_fork_wrappers = \ @@ -1093,7 +1093,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \ ^(examples/|tools/virsh-edit\.c$$) exclude_file_name_regexp--sc_trailing_blank = \ - (/qemuhelpdata/|/sysinfodata/.*\.data|\.(fig|gif|ico|png)$$) + /qemuhelpdata/|/sysinfodata/.*\.data$$ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ -- 1.9.3

3 3