- Devel - libvirt List Archives

[libvirt] [PATCH 0/8] domain: Support <address type='pci'/> allocation
by Cole Robinson 15 May '16

15 May '16

This patch series allows the user to specify bare device <address type='pci'/> to explicitly request PCI address allocation. This has several uses, but the motivating one is providing an easy way to request PCI address allocation where it normally isn't the default address type, like for aarch64 VMs. Cole Robinson (8): domain: Add virDomainDefAddImplicitDevices domain: conf: Export virDomainDefPostParseDevices qemu: Assign device addresses in PostParse util: xml: add virXMLPropertyCount tests: Add failure flags to CompareDomainXML2XML domain: Make <address type='pci'/> request address allocation qemu: Wire up address type=pci auto_allocate tests: qemu: test <address type='pci'/> with aarch64 docs/schemas/domaincommon.rng | 5 +- src/conf/domain_conf.c | 81 +++++++++++++++++----- src/conf/domain_conf.h | 8 ++- src/libvirt_private.syms | 3 +- src/qemu/qemu_domain.c | 13 +++- src/qemu/qemu_domain_address.c | 47 +++++++++++++ src/qemu/qemu_driver.c | 6 +- src/util/virxml.c | 17 +++++ src/util/virxml.h | 1 + src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- .../generic-pci-autofill-addr.xml | 27 ++++++++ tests/genericxml2xmltest.c | 17 +++-- tests/lxcxml2xmltest.c | 2 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 4 +- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 4 +- ...ml2argv-aarch64-virtio-pci-manual-addresses.xml | 5 ++ .../qemuxml2argv-pci-autofill-addr.args | 24 +++++++ .../qemuxml2argv-pci-autofill-addr.xml | 44 ++++++++++++ tests/qemuxml2argvtest.c | 21 +++--- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 5 ++ .../qemuxml2xmlout-pci-autofill-addr.xml | 46 ++++++++++++ tests/qemuxml2xmltest.c | 18 +++-- tests/testutils.c | 10 ++- tests/testutils.h | 4 ++ 26 files changed, 359 insertions(+), 59 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-pci-autofill-addr.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-autofill-addr.xml -- 2.5.0

3 21

[libvirt] [PATCH v4 0/8] tests: Introduce global mock library
by Michal Privoznik 14 May '16

14 May '16

diff to v3: - Well, I've found out that we have virmock.h that can be used just for what Peter suggested earlier: have LOAD_SYM shared. To my surprise, we already have a macro just for that = VIR_MOCK_REAL_INIT. - As agreed in v3, this feature is yet not enabled by default, but only if a env var is set. In order to do that, I have to write (hackish?) patch 5/8. Michal Privoznik (8): virpcimock: Adapt to virmock.h vircgroupmock: Adapt to virmock.h nssmock: Adapt to virmock.h securityselinuxhelper: Adapt to virmock.h virmock.h: Introduce VIR_MOCK_CALL_STAT tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 10 ++ Makefile.am | 3 + cfg.mk | 2 +- docs/hacking.html.in | 13 +++ tests/Makefile.am | 28 ++++- tests/check-file-access.pl | 104 ++++++++++++++++++ tests/file_access_whitelist.txt | 23 ++++ tests/nssmock.c | 27 ++--- tests/securityselinuxhelper.c | 80 ++++++-------- tests/testutils.c | 30 ++++-- tests/testutils.h | 10 +- tests/vircgroupmock.c | 83 ++++++--------- tests/virmock.h | 33 ++++++ tests/virpcimock.c | 96 +++++++---------- tests/virtestmock.c | 226 ++++++++++++++++++++++++++++++++++++++++ 16 files changed, 583 insertions(+), 186 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.8.1

3 19

[libvirt] [PATCH v2 0/3] qemu: Fix hotplug of guest agent
by Martin Kletzander 14 May '16

14 May '16

v2: - mostly a rebase, it was almost ACKed but not completely, just to make sure let's see it again with everything done. - use /tmp for paths in tests (automatically fixed by rebasing on top of commit 1893b6df117b) v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg01454.html Martin Kletzander (3): qemuhotplugtest: Allow testing of live data qemu: Move channel path generation out of command creation qemu: Generate channel target paths on hotplug as well src/qemu/qemu_command.c | 25 ++-------- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 20 ++++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_process.c | 12 +++-- tests/qemuhotplugtest.c | 37 ++++++++++---- .../qemuhotplug-hotplug-base+qemu-agent-detach.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-hotplug-base+qemu-agent.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-qemu-agent-detach.xml | 5 ++ .../qemuhotplugtestdata/qemuhotplug-qemu-agent.xml | 5 ++ 11 files changed, 193 insertions(+), 39 deletions(-) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml -- 2.8.1

2 8

[libvirt] [PATCH] qemu.conf: spaces correction
by poma 14 May '16

14 May '16

libvirt/qemu.conf: spaces correction --- src/qemu/qemu.conf | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 4fa5e8a..5cf4599 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -38,7 +38,7 @@ # # ca-cert.pem - the CA master certificate # server-cert.pem - the server certificate signed with ca-cert.pem -# server-key.pem - the server private key +# server-key.pem - the server private key # # This option allows the certificate directory to be changed # @@ -123,7 +123,7 @@ # # ca-cert.pem - the CA master certificate # server-cert.pem - the server certificate signed with ca-cert.pem -# server-key.pem - the server private key +# server-key.pem - the server private key # # This option allows the certificate directory to be changed. # @@ -179,7 +179,7 @@ #remote_display_port_max = 65535 # VNC WebSocket port policies, same rules apply as with remote display -# ports. VNC WebSockets use similar display <-> port mappings, with +# ports. VNC WebSockets use similar display <-> port mappings, with # the exception being that ports start from 5700 instead of 5900. # #remote_websocket_port_min = 5700 @@ -196,7 +196,7 @@ # security_driver = [ "selinux", "apparmor" ] # # Notes: The DAC security driver is always enabled; as a result, the -# value of security_driver cannot contain "dac". The value "none" is +# value of security_driver cannot contain "dac". The value "none" is # a special value; security_driver can be set to that value in # isolation, but it cannot appear in a list of drivers. # @@ -272,7 +272,7 @@ # "/dev/null", "/dev/full", "/dev/zero", # "/dev/random", "/dev/urandom", # "/dev/ptmx", "/dev/kvm", "/dev/kqemu", -# "/dev/rtc","/dev/hpet", "/dev/vfio/vfio" +# "/dev/rtc", "/dev/hpet", "/dev/vfio/vfio" #] # # RDMA migration requires the following extra files to be added to the list: @@ -285,11 +285,11 @@ # The default format for Qemu/KVM guest save images is raw; that is, the -# memory from the domain is dumped out directly to a file. If you have +# memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite -# a bit of space. If you would like to compress the images while they +# a bit of space. If you would like to compress the images while they # are being saved to disk, you can also set "lzop", "gzip", "bzip2", or "xz" -# for save_image_format. Note that this means you slow down the process of +# for save_image_format. Note that this means you slow down the process of # saving a domain in order to save disk space; the list above is in descending # order by performance and ascending order by compression ratio. # @@ -319,7 +319,7 @@ # When a domain is configured to be auto-dumped, enabling this flag # has the same effect as using the VIR_DUMP_BYPASS_CACHE flag with the -# virDomainCoreDump API. That is, the system will avoid using the +# virDomainCoreDump API. That is, the system will avoid using the # file system cache while writing the dump file, but may cause # slower operation. # @@ -327,17 +327,17 @@ # When a domain is configured to be auto-started, enabling this flag # has the same effect as using the VIR_DOMAIN_START_BYPASS_CACHE flag -# with the virDomainCreateWithFlags API. That is, the system will +# with the virDomainCreateWithFlags API. That is, the system will # avoid using the file system cache when restoring any managed state # file, but may cause slower operation. # #auto_start_bypass_cache = 0 # If provided by the host and a hugetlbfs mount point is configured, -# a guest may request huge page backing. When this mount point is +# a guest may request huge page backing. When this mount point is # unspecified here, determination of a host mount point in /proc/mounts -# will be attempted. Specifying an explicit mount overrides detection -# of the same in /proc/mounts. Setting the mount point to "" will +# will be attempted. Specifying an explicit mount overrides detection +# of the same in /proc/mounts. Setting the mount point to "" will # disable guest hugepage backing. If desired, multiple mount points can # be specified at once, separated by comma and enclosed in square # brackets, for example: @@ -353,9 +353,9 @@ #hugetlbfs_mount = "/dev/hugepages" -# Path to the setuid helper for creating tap devices. This executable +# Path to the setuid helper for creating tap devices. This executable # is used to create <source type='bridge'> interfaces when libvirtd is -# running unprivileged. libvirt invokes the helper directly, instead +# running unprivileged. libvirt invokes the helper directly, instead # of using "-netdev bridge", for security reasons. #bridge_helper = "/usr/libexec/qemu-bridge-helper" @@ -411,7 +411,7 @@ # # WARNING: Enabling probing is a security hole in almost all # deployments. It is strongly recommended that users update their -# guest XML <disk> elements to include <driver type='XXXX'/> +# guest XML <disk> elements to include <driver type='XXXX'/> # elements instead of enabling this option. # #allow_disk_format_probing = 1 @@ -437,18 +437,18 @@ ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote -# libvirtd during peer-to-peer migration. A keepalive message is +# libvirtd during peer-to-peer migration. A keepalive message is # sent to the daemon after keepalive_interval seconds of inactivity # to check if the daemon is still responding; keepalive_count is a # maximum number of keepalive messages that are allowed to be sent # to the daemon without getting any response before the connection -# is considered broken. In other words, the connection is +# is considered broken. In other words, the connection is # automatically closed approximately after # keepalive_interval * (keepalive_count + 1) seconds since the last # message received from the daemon. If keepalive_interval is set to # -1, qemu driver will not send keepalive requests during # peer-to-peer migration; however, the remote libvirtd can still -# send them and source libvirtd will send responses. When +# send them and source libvirtd will send responses. When # keepalive_count is set to 0, connections will be automatically # closed after keepalive_interval seconds of inactivity without # sending any keepalive messages. @@ -471,9 +471,9 @@ # The default hostname or IP address which will be used by a migration -# source for transferring migration data to this host. The migration +# source for transferring migration data to this host. The migration # source has to be able to resolve this hostname and connect to it so -# setting "localhost" will not work. By default, the host's configured +# setting "localhost" will not work. By default, the host's configured # hostname is used. #migration_host = "host.example.com" -- 2.4.11

7 10

[libvirt] error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

Hi, I am getting the following error when I try to migrate VM on my network using virsh migrate: error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS ; but, other vm's running on the server successfully migrated to remote server; Libvirt Version: libvirt-0.10.2-46.el6.x86_64; Qemu-kvm Version: qemu-kvm-0.12.1.2-2.448.el6.3.x86_64; OS Version: Red Hat Enterprise Linux Server release 6.6; Thanks~ Work Hard, Have Fun, Make History! Mail: raojunming113(a)pingan.com -----邮件原件----- 发件人: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] 代表 libvir-list-request(a)redhat.com 发送时间: 2016年5月14日 7:47 收件人: libvir-list(a)redhat.com 主题: libvir-list Digest, Vol 126, Issue 182 Send libvir-list mailing list submissions to libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> To subscribe or unsubscribe via the World Wide Web, visit https://www.redhat.com/mailman/listinfo/libvir-list or, via email, send a message with subject or body 'help' to libvir-list-request(a)redhat.com<mailto:libvir-list-request@redhat.com> You can reach the person managing the list at libvir-list-owner(a)redhat.com<mailto:libvir-list-owner@redhat.com> When replying, please edit your Subject line so it is more specific than "Re: Contents of libvir-list digest..." Today's Topics: 1. [PATCH 3/6] iscsi: Export virISCSITargetAutologin (John Ferlan) 2. [PATCH 4/6] util: Add "--op nonpersistent" to iSCSI sendtargets (John Ferlan) 3. [PATCH 5/6] iscsi: Inhibit autologin for only libvirt managed targets (John Ferlan) 4. [PATCH 6/6] iscsi: Remove initiatoriqn from virISCSIScanTargets (John Ferlan) 5. [PATCH] capabilities: Advertise cpuselection if -cpu host is usable (Jiri Denemark) 6. Re: [PATCH 0/2] libxl: support pvusb (Jim Fehlig) 7. Re: [PATCH] libxl: add .domainInterfaceAddresses (Jim Fehlig) ---------------------------------------------------------------------- Message: 1 Date: Fri, 13 May 2016 17:29:23 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 3/6] iscsi: Export virISCSITargetAutologin Message-ID: <1463174966-3185-4-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-4-git-send-email-jferlan@redhat.com>> Make it accessible for future patches Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/libvirt_private.syms | 1 + src/util/viriscsi.c | 2 +- src/util/viriscsi.h | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fb24808..719d753 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1675,6 +1675,7 @@ virISCSIGetSession; virISCSINodeUpdate; virISCSIRescanLUNs; virISCSIScanTargets; +virISCSITargetAutologin; # util/virjson.h diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index be296d7..ea01b3d 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -404,7 +404,7 @@ virISCSIGetTargets(char **const groups, } -static int +int virISCSITargetAutologin(const char *portal, const char *initiatoriqn, const char *target, diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index f4093f7..3e7ea68 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -48,6 +48,13 @@ virISCSIRescanLUNs(const char *session) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int +virISCSITargetAutologin(const char *portal, + const char *initiatoriqn, + const char *target, + bool enable) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + +int virISCSIScanTargets(const char *portal, const char *initiatoriqn, size_t *ntargetsret, -- 2.5.5 ------------------------------ Message: 2 Date: Fri, 13 May 2016 17:29:24 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 4/6] util: Add "--op nonpersistent" to iSCSI sendtargets Message-ID: <1463174966-3185-5-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-5-git-send-email-jferlan@redhat.com>> From: Fritz Elfert <fritz(a)fritz-elfert.de<mailto:fritz@fritz-elfert.de>> The root cause of commit id '3c12b654' was to ensure that an iSCSI sendtargets command to discover all the available targets on the host didn't reset the "node.startup" value for a future restarts on any target that libvirt is managing. However, by adding the "--op nonpersistent" inhibits the iSCSI initiator from recording/modifying in the bowels /var/lib/iscsi of any target. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/util/viriscsi.c | 1 + tests/viriscsitest.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index ea01b3d..36612c5 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -446,6 +446,7 @@ virISCSIScanTargets(const char *portal, "--mode", "discovery", "--type", "sendtargets", "--portal", portal, + "--op", "nonpersistent", NULL); memset(&list, 0, sizeof(list)); diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index c697a4a..b5b0e20 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -90,7 +90,9 @@ static void testIscsiadmCb(const char *const*args, args[4] && STREQ(args[4], "sendtargets") && args[5] && STREQ(args[5], "--portal") && args[6] && STREQ(args[6], "10.20.30.40:3260,1") && - args[7] == NULL) { + args[7] && STREQ(args[7], "--op") && + args[8] && STREQ(args[8], "nonpersistent") && + args[9] == NULL) { ignore_value(VIR_STRDUP(*output, iscsiadmSendtargetsOutput)); } else { *status = -1; -- 2.5.5 ------------------------------ Message: 3 Date: Fri, 13 May 2016 17:29:25 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 5/6] iscsi: Inhibit autologin for only libvirt managed targets Message-ID: <1463174966-3185-6-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-6-git-send-email-jferlan@redhat.com>> https://bugzilla.redhat.com/show_bug.cgi?id=1331552 Based on code originally posted by Fritz Elfert <fritz(a)fritz-elfert.de<mailto:fritz@fritz-elfert.de>> to remove the Autologin code entirely from libvirt, but reworked to only set Autologin for libvirt managed targets. Commit id '3c12b654' took a "large hammer" approach to inhibiting logins which causes issues if there are iSCSI targets not being managed by libvirt. Now that the previous commit ensures that the iscsi initiator doesn't update the /var/lib/iscsi tree with the results for a 'sendtargets' by using the "--op nonpersistent" option, let's remove the code from virISCSIScanTargets that disables autologin for every target, but add that same setting into the start pool code for each managed/started target to ensure that nothing else goes and tries to autologin. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/storage/storage_backend_iscsi.c | 11 +++++++++++ src/util/viriscsi.c | 15 ++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 9e2d01e..5fbf390 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -404,6 +404,17 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, NULL, NULL) < 0) goto cleanup; + /* Inhibit our autologin for our managed source device */ + if (virISCSITargetAutologin(portal, + pool->def->source.initiator.iqn, + pool->def->source.devices[0].path, + false) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to inhibit autologin for target '%s'"), + pool->def->source.devices[0].path); + goto cleanup; + } + if (virStorageBackendISCSISetAuth(portal, conn, &pool->def->source) < 0) goto cleanup; diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 36612c5..3133d88 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -415,13 +415,14 @@ virISCSITargetAutologin(const char *portal, "--value", enable ? "automatic" : "manual", NULL }; + VIR_DEBUG("set autologin for '%s' to '%d'", target, enable); return virISCSIConnection(portal, initiatoriqn, target, extraargv); } int virISCSIScanTargets(const char *portal, - const char *initiatoriqn, + const char *initiatoriqn ATTRIBUTE_UNUSED, size_t *ntargetsret, char ***targetsret) { @@ -459,18 +460,6 @@ virISCSIScanTargets(const char *portal, &list, NULL, NULL) < 0) goto cleanup; - for (i = 0; i < list.ntargets; i++) { - /* We have to ignore failure, because we can't undo - * the results of 'sendtargets', unless we go scrubbing - * around in the dirt in /var/lib/iscsi. - */ - if (virISCSITargetAutologin(portal, - initiatoriqn, - list.targets[i], false) < 0) - VIR_WARN("Unable to disable auto-login on iSCSI target %s: %s", - portal, list.targets[i]); - } - if (ntargetsret && targetsret) { *ntargetsret = list.ntargets; *targetsret = list.targets; -- 2.5.5 ------------------------------ Message: 4 Date: Fri, 13 May 2016 17:29:26 -0400 From: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH 6/6] iscsi: Remove initiatoriqn from virISCSIScanTargets Message-ID: <1463174966-3185-7-git-send-email-jferlan(a)redhat.com<mailto:1463174966-3185-7-git-send-email-jferlan@redhat.com>> No longer necessary to have it, so remove it. Signed-off-by: John Ferlan <jferlan(a)redhat.com<mailto:jferlan@redhat.com>> --- src/storage/storage_backend_iscsi.c | 8 ++------ src/util/viriscsi.c | 3 +-- src/util/viriscsi.h | 1 - tests/viriscsitest.c | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 5fbf390..b6b23d3 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -197,9 +197,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, if (!(portal = virStorageBackendISCSIPortal(source))) goto cleanup; - if (virISCSIScanTargets(portal, - source->initiator.iqn, - &ntargets, &targets) < 0) + if (virISCSIScanTargets(portal, &ntargets, &targets) < 0) goto cleanup; if (VIR_ALLOC_N(list.sources, ntargets) < 0) @@ -399,9 +397,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, * iscsiadm doesn't let you login to a target, unless you've * first issued a 'sendtargets' command to the portal :-( */ - if (virISCSIScanTargets(portal, - pool->def->source.initiator.iqn, - NULL, NULL) < 0) + if (virISCSIScanTargets(portal, NULL, NULL) < 0) goto cleanup; /* Inhibit our autologin for our managed source device */ diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 3133d88..a2acb67 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -321,7 +321,7 @@ virISCSIConnection(const char *portal, * portal. Without the sendtargets all that is received is a * "iscsiadm: No records found" */ - if (virISCSIScanTargets(portal, initiatoriqn, NULL, NULL) < 0) + if (virISCSIScanTargets(portal, NULL, NULL) < 0) goto cleanup; break; @@ -422,7 +422,6 @@ virISCSITargetAutologin(const char *portal, int virISCSIScanTargets(const char *portal, - const char *initiatoriqn ATTRIBUTE_UNUSED, size_t *ntargetsret, char ***targetsret) { diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index 3e7ea68..44fb1f4 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -56,7 +56,6 @@ virISCSITargetAutologin(const char *portal, int virISCSIScanTargets(const char *portal, - const char *initiatoriqn, size_t *ntargetsret, char ***targetsret) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index b5b0e20..40e4d10 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -145,8 +145,7 @@ testISCSIScanTargets(const void *data) virCommandSetDryRun(NULL, testIscsiadmCb, NULL); - if (virISCSIScanTargets(info->portal, NULL, - &ntargets, &targets) < 0) + if (virISCSIScanTargets(info->portal, &ntargets, &targets) < 0) goto cleanup; if (info->nexpected != ntargets) { -- 2.5.5 ------------------------------ Message: 5 Date: Fri, 13 May 2016 23:36:17 +0200 From: Jiri Denemark <jdenemar(a)redhat.com<mailto:jdenemar@redhat.com>> To: libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> Subject: [libvirt] [PATCH] capabilities: Advertise cpuselection if -cpu host is usable Message-ID: <a3394e6b8d0f28591147dd981909e9a1ae39f64d.1463175377.git.jdenemar(a)redhat.com<mailto:a3394e6b8d0f28591147dd981909e9a1ae39f64d.1463175377.git.jdenemar@redhat.com>> When -cpu host is supported by a QEMU binary, a user can use <cpu mode='host-passthrough'/> in domain XML even when libvirtd failed to find a matching model for the host CPU. Let's make it obvious by advertising <cpuselection/> guest capability whenever -cpu host is supported. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com<mailto:jdenemar@redhat.com>> --- src/qemu/qemu_capabilities.c | 7 ++++--- tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1bddf43..fcfd1cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -928,9 +928,10 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, machines = NULL; nmachines = 0; - if (caps->host.cpu && - caps->host.cpu->model && - virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && + if ((virQEMUCapsGet(qemubinCaps, QEMU_CAPS_CPU_HOST) || + (caps->host.cpu && + caps->host.cpu->model && + virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0)) && !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false)) goto cleanup; diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.xml b/tests/qemucaps2xmldata/all_1.6.0-1.xml index 2489f49..84d6000 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/all_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> <acpi default='on' toggle='yes'/> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml index 281fab0..28762c2 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml @@ -18,6 +18,7 @@ </domain> </arch> <features> + <cpuselection/> <deviceboot/> <disksnapshot default='off' toggle='no'/> <acpi default='on' toggle='yes'/> -- 2.8.2 ------------------------------ Message: 6 Date: Fri, 13 May 2016 16:57:30 -0600 From: Jim Fehlig <jfehlig(a)suse.com<mailto:jfehlig@suse.com>> To: Joao Martins <joao.m.martins(a)oracle.com<mailto:joao.m.martins@oracle.com>> Cc: libvirt-list(a)redhat.com<mailto:libvirt-list@redhat.com> Subject: Re: [libvirt] [PATCH 0/2] libxl: support pvusb Message-ID: <57365BDA.7090005(a)suse.com<mailto:57365BDA.7090005@suse.com>> Content-Type: text/plain; charset=windows-1252 On 05/13/2016 07:14 AM, Joao Martins wrote: > On 05/12/2016 11:43 PM, Jim Fehlig wrote: >> Chunyan Liu wrote: >>> This patch series is to support pvusb in libxl driver. >>> >>> Chunyan Liu (2): >>> libxl: support creating guest with USB hostdev >>> libxl: support hotplug USB host device >> This series should also include support for converting domXML USB config to/from >> xl.cfg(5) in src/xenconfig/xen_xl.c, along with a test. >> >> FYI, the series fails to build with Xen < 4.7, where LIBXL_HAVE_PVUSB is not >> defined :-). > Probably a nice follow-up after this series is in, would be to add the USB > subsys type to domain capabilities (that you address in the OVMF series) Yes, good point. I'll add it to that series if this one makes it in first. Speaking of the OVMF series, I've fixed a few things after more testing and will rebase and resend a V2. Thanks in advance if either of you have time to look at it. Regards, Jim ------------------------------ Message: 7 Date: Fri, 13 May 2016 17:47:09 -0600 From: Jim Fehlig <jfehlig(a)suse.com<mailto:jfehlig@suse.com>> To: Chunyan Liu <cyliu(a)suse.com<mailto:cyliu@suse.com>>, libvirt-list(a)redhat.com<mailto:libvirt-list@redhat.com> Subject: Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses Message-ID: <5736677D.8030209(a)suse.com<mailto:5736677D.8030209@suse.com>> Content-Type: text/plain; charset=windows-1252 On 05/13/2016 12:21 AM, Chunyan Liu wrote: > Add .domainInterfaceAddresses so that user can have a way to > get domain interface address by 'virsh domifaddr'. Currently > it only supports '--source lease'. > > Signed-off: Chunyan Liu <cyliu(a)suse.com<mailto:cyliu@suse.com>> > --- > src/libxl/libxl_driver.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 140 insertions(+) > > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index 062d6f8..f2bd6fa 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr conn, > return 0; > } > > +static int > +libxlGetDHCPInterfaces(virDomainPtr dom, > + virDomainObjPtr vm, > + virDomainInterfacePtr **ifaces) > +{ > + int rv = -1; > + int n_leases = 0; > + size_t i, j; > + size_t ifaces_count = 0; > + virNetworkPtr network = NULL; > + char macaddr[VIR_MAC_STRING_BUFLEN]; > + virDomainInterfacePtr iface = NULL; > + virNetworkDHCPLeasePtr *leases = NULL; > + virDomainInterfacePtr *ifaces_ret = NULL; > + > + if (!dom->conn->networkDriver || > + !dom->conn->networkDriver->networkGetDHCPLeases) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("Network driver does not support DHCP lease query")); > + return -1; > + } > + > + for (i = 0; i < vm->def->nnets; i++) { > + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) > + continue; > + > + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); > + virObjectUnref(network); > + network = virNetworkLookupByName(dom->conn, > + vm->def->nets[i]->data.network.name); > + > + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, > + &leases, 0)) < 0) > + goto error; > + > + if (n_leases) { > + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) > + goto error; > + > + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) > + goto error; > + > + iface = ifaces_ret[ifaces_count - 1]; > + /* Assuming each lease corresponds to a separate IP */ > + iface->naddrs = n_leases; > + > + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) > + goto error; > + > + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) > + goto cleanup; > + > + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) > + goto cleanup; > + } > + > + for (j = 0; j < n_leases; j++) { > + virNetworkDHCPLeasePtr lease = leases[j]; > + virDomainIPAddressPtr ip_addr = &iface->addrs[j]; > + > + if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) > + goto cleanup; > + > + ip_addr->type = lease->type; > + ip_addr->prefix = lease->prefix; > + } > + > + for (j = 0; j < n_leases; j++) > + virNetworkDHCPLeaseFree(leases[j]); > + > + VIR_FREE(leases); > + } > + > + *ifaces = ifaces_ret; > + ifaces_ret = NULL; > + rv = ifaces_count; > + > + cleanup: > + virObjectUnref(network); > + if (leases) { > + for (i = 0; i < n_leases; i++) > + virNetworkDHCPLeaseFree(leases[i]); > + } > + VIR_FREE(leases); > + > + return rv; > + > + error: > + if (ifaces_ret) { > + for (i = 0; i < ifaces_count; i++) > + virDomainInterfaceFree(ifaces_ret[i]); > + } > + VIR_FREE(ifaces_ret); > + > + goto cleanup; > +} It's unfortunate this is a copy-paste from the qemu driver. The code is not trivial and any bug fixes in one copy could be missed in the other. A lot of the function is domain related, so probably can't be abstracted further to the network code. Have you considered approaches that allow the drivers to share this code? Regards, Jim ------------------------------ -- libvir-list mailing list libvir-list(a)redhat.com<mailto:libvir-list@redhat.com> https://www.redhat.com/mailman/listinfo/libvir-list End of libvir-list Digest, Vol 126, Issue 182 ********************************************* ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] 撤回: error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

饶俊明(云平台事业部) 将撤回邮件“error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS”。 ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

[libvirt] error: internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS
by 饶俊明(云平台事业部) 14 May '16

14 May '16

Hi, I am getting the following error when I try to migrate VM on my network using virsh migrate; error : qemuMonitorJSONCheckError:359 : internal error unable to execute QEMU command 'getfd': No file descriptor supplied via SCM_RIGHTS but, other vm's running on the server successfully migrated to remote server; Libvirt Version: libvirt-0.10.2-46.el6.x86_64 Qemu-kvm Version: qemu-kvm-0.12.1.2-2.448.el6.3.x86_64 OS Version: Red Hat Enterprise Linux Server release 6.6 Thanks~ ******************************************************************************************************************************** The information in this email is confidential and may be legally privileged. If you have received this email in error or are not the intended recipient, please immediately notify the sender and delete this message from your computer. Any use, distribution, or copying of this email other than by the intended recipient is strictly prohibited. All messages sent to and from us may be monitored to ensure compliance with internal policies and to protect our business. Emails are not secure and cannot be guaranteed to be error free as they can be intercepted, amended, lost or destroyed, or contain viruses. Anyone who communicates with us by email is taken to accept these risks. 收发邮件者请注意：本邮件含保密信息，若误收本邮件，请务必通知发送人并直接删去，不得使用、传播或复制本邮件。进出邮件均受到本公司合规监控。邮件可能发生被截留、被修改、丢失、被破坏或包含计算机病毒等不安全情况。 ********************************************************************************************************************************

1 0

Re: [libvirt] [libvirt-users] libvirt + openvswitch, <parameters interfaceid='x'/> seems less-than-useful?
by Laine Stump 14 May '16

14 May '16

On 05/13/2016 08:24 PM, Richard Harman wrote: > On 05/13/16 20:04, Laine Stump wrote: >> On 05/13/2016 09:57 AM, Richard Harman wrote: >>> I've debugged this, and I think the interfaceid stuff in network XML >>> isn't doing much besides setting a custom interfaceid in an OpenVSwitch >>> table that really has no effect on the operation of OpenVSwitch. I >>> think the -- set Interface vnet0 "external-ids:iface-id="{uuid here}" >>> command run by libvirt doesn't actually set the _uuid of a new >>> interface. :( >> I don't use Open vSwitch, but I was around when the support was added, >> and reviewed the patches (which were authored by Kyle Mestery, whose >> email has changed since then, so I'm not sure how to Cc him). My >> understanding at the time was that the interfaceid was intended for >> exactly the purpose that you say doesn't work (i.e. so that OVS itself >> could recognize that interface as it appeared and disappeared at >> different locations on the network). I would classify that as a bug, >> but that's just my understanding as an OVS outsider. >> > Further evidence, now that I figured out how to dump the external-ids > stuff in OVS: > > Here's the relevant ports of the domain XML: > > <domain type='kvm' id='5'> > <name>cuckoo</name> > <uuid>cb4903aa-eaf4-432d-aa57-e9f74f1c8b79</uuid> > .... > <interface type='bridge'> > <mac address='52:54:00:f5:29:72'/> > <source network='malware' bridge='malware0'/> > <virtualport type='openvswitch'> > <parameters interfaceid='23e982f3-f344-48a2-8bed-b584acb95616'/> > </virtualport> > <target dev='monitor0'/> > <model type='virtio'/> > <alias name='net2'/> > <address type='pci' domain='0x0000' bus='0x00' slot='0x08' > function='0x0'/> > </interface> > .... > > cuckoo vm up: monitor0 _uuid is 969ef76c... > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > name : "monitor0" > _uuid : 969ef76c-c802-4e9f-97e0-9a06ce133252 > external_ids : {attached-mac="52:54:00:f5:29:72", > iface-id="23e982f3-f344-48a2-8bed-b584acb95616", iface-status=active, > vm-id="cb4903aa-eaf4-432d-aa57-e9f74f1c8b79"} > # > > cuckoo vm down: (no output, the interface has been deleted by libvirt) > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > # > > I found this in my log, showing libvirt deleted the interface: > ovs-vsctl[4590]: ovs|00001|vsctl|INFO|Called as ovs-vsctl --timeout=5 -- > --if-exists del-port monitor0 > > cuckoo vm up again: uuid is now fb025df0... > > # ovs-vsctl --columns=name,_uuid,external-ids list Interface | grep -A3 > monitor0 > name : "monitor0" > _uuid : fb025df0-d934-46d6-b9ed-314bc1de5ef3 > external_ids : {attached-mac="52:54:00:f5:29:72", > iface-id="23e982f3-f344-48a2-8bed-b584acb95616", iface-status=active, > vm-id="cb4903aa-eaf4-432d-aa57-e9f74f1c8b79"} > # > > Anyway, thanks for reading! Hopefully we'll get to the bottom of this, > where I can keep my span port. :) In the mean time I'm going to go > digging through the OVS source, specifically the ovs-vsctl command to > see if an argument can be used to forcibly set the internal _uuid in OVS. Right. Either the ovs-vsctl command used by libvirt needs to change, or (if it's actually a bug in OVS) ovs-ctl's use of external-ids:iface-id needs to change. I'm Cc'ing libvir-list, just in case there's an OVS person who monitors that list but not this one.

1 0

[libvirt] [PATCH] bhyve: implement virConnectGetType
by Fabian Freyer 13 May '16

13 May '16

This implements virConnectGetType for the bhyve driver. --- src/bhyve/bhyve_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 4fc504e..a853e94 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1508,6 +1508,15 @@ bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) return ret; } +static const char * +bhyveConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + if (virConnectGetTypeEnsureACL(conn) < 0) + return NULL; + + return "BHYVE"; +} + static virHypervisorDriver bhyveHypervisorDriver = { .name = "bhyve", .connectOpen = bhyveConnectOpen, /* 1.2.2 */ @@ -1557,6 +1566,7 @@ static virHypervisorDriver bhyveHypervisorDriver = { .connectDomainEventRegisterAny = bhyveConnectDomainEventRegisterAny, /* 1.2.5 */ .connectDomainEventDeregisterAny = bhyveConnectDomainEventDeregisterAny, /* 1.2.5 */ .domainHasManagedSaveImage = bhyveDomainHasManagedSaveImage, /* 1.2.13 */ + .connectGetType = bhyveConnectGetType, /* 1.3.5 */ }; -- 2.1.4

3 5

[libvirt] [PATCH 0/4] Automatically choose usable GIC version
by Andrea Bolognani 13 May '16

13 May '16

Currently, if no GIC version has been provided by the user, libvirt will default to GIC v2. This is a problem when trying to create new guests on hardware that only supports GIC v3 guests: QEMU will refuse to start a GIC v2 guest, and guest installation will abort immediately. This series implements a way for libvirt to figure out a suitable GIC version itself, without relying on tools such as virt-install to parse the domain capabilities before attempting installation. Andrea Bolognani (4): qemu: Automatically choose usable GIC version qemu: Add virQEMUCapsSetGICCapabilities() tests: Prepare to have different usable GIC versions tests: Try different usable GIC versions src/conf/domain_capabilities.c | 25 +++ src/conf/domain_capabilities.h | 8 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 29 +++- src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_domain.c | 66 ++++++-- .../qemuxml2argv-aarch64-gic-none-both.args | 1 + .../qemuxml2argv-aarch64-gic-none-both.xml | 1 + .../qemuxml2argv-aarch64-gic-none-v2.args | 1 + .../qemuxml2argv-aarch64-gic-none-v2.xml | 1 + .../qemuxml2argv-aarch64-gic-none-v3.args | 1 + .../qemuxml2argv-aarch64-gic-none-v3.xml | 1 + tests/qemuxml2argvtest.c | 153 +++++++++++++---- .../qemuxml2xmlout-aarch64-gic-none-both.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none-v2.xml | 1 + .../qemuxml2xmlout-aarch64-gic-none-v3.xml | 1 + tests/qemuxml2xmltest.c | 184 +++++++++++++-------- 17 files changed, 368 insertions(+), 112 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-both.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v2.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.args create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-v3.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-both.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-v3.xml -- 2.5.5

3 10

[libvirt] [PATCH 0/2] libxl: A few more fixes related to vram
by Jim Fehlig 13 May '16

13 May '16

Commit 3e428670 broke the xlconfigtests, which commit 96b21fb0 mostly fixed. I found that running 'make check' on a machine with Xen installed (/usr/lib/xen/bin/qemu-{dm,system-i386} exists) failed. Test files containing <emulator>/usr/lib/xen/bin/qemu-dm</emulator> resulted in vram being set to the lower default values defined by the old qemu-dm. This series takes one possible approach to fixing the problem by only using qemu-xen (aka qemu upstream) in the test files (note that libxl defaults to qemu-xen if an emulator is not specified). Actually, it's patch 2 that changes the test files. I added patch 1 after seeing errors such as libvirt: error : internal error: Child process (/usr/lib/xen/bin/qemu-dm -help) unexpected exit status 127: libvirt: error : cannot execute binary /usr/lib/xen/bin/qemu-dm: No such file or directory when specifying a non-existent emulator. Another approach, suggested by Joao, is to allow vram == 0 and when building the domain, set video_memkb in the libxl_domain_build_info struct to LIBXL_MEMKB_DEFAULT, allowing libxl to pick the correct default. For this approach, the <video> parsing logic would have to change again. Currently, it sets a vram defaults if not done by the driver post parse function. Along with adjusting the libxl driver to handle vram = 0, all the xlconfigtests would have to change. E.g. - <model type='cirrus' vram='8192' heads='1' primary='yes'/> + <model type='cirrus' heads='1' primary='yes'/> Jim Fehlig (2): libxl: don't attempt to probe a non-existent emulator xlconfigtests: use qemu-xen in all test data files src/libxl/libxl_conf.c | 3 +++ tests/xlconfigdata/test-disk-positional-parms-full.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-full.xml | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.cfg | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.cfg | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- 19 files changed, 21 insertions(+), 18 deletions(-) -- 2.8.2

2 7

[libvirt] [PATCH] virt-aa-helper: remove replace_string and use virStringReplace instead
by Pavel Hrdina 13 May '16

13 May '16

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/security/virt-aa-helper.c | 76 +++++-------------------------------------- 1 file changed, 9 insertions(+), 67 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7eeb4ef..537e89d 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -148,62 +148,6 @@ vah_info(const char *str) } /* - * Replace @oldstr in @orig with @repstr - * @len is number of bytes allocated for @orig. Assumes @orig, @oldstr and - * @repstr are null terminated - */ -static int -replace_string(char *orig, const size_t len, const char *oldstr, - const char *repstr) -{ - int idx; - char *pos = NULL; - char *tmp = NULL; - - if ((pos = strstr(orig, oldstr)) == NULL) { - vah_error(NULL, 0, _("could not find replacement string")); - return -1; - } - - if (VIR_ALLOC_N_QUIET(tmp, len) < 0) { - vah_error(NULL, 0, _("could not allocate memory for string")); - return -1; - } - tmp[0] = '\0'; - - idx = abs(pos - orig); - - /* copy everything up to oldstr */ - strncat(tmp, orig, idx); - - /* add the replacement string */ - if (strlen(tmp) + strlen(repstr) > len - 1) { - vah_error(NULL, 0, _("not enough space in target buffer")); - VIR_FREE(tmp); - return -1; - } - strcat(tmp, repstr); - - /* add everything after oldstr */ - if (strlen(tmp) + strlen(orig) - (idx + strlen(oldstr)) > len - 1) { - vah_error(NULL, 0, _("not enough space in target buffer")); - VIR_FREE(tmp); - return -1; - } - strncat(tmp, orig + idx + strlen(oldstr), - strlen(orig) - (idx + strlen(oldstr))); - - if (virStrcpy(orig, tmp, len) == NULL) { - vah_error(NULL, 0, _("error replacing string")); - VIR_FREE(tmp); - return -1; - } - VIR_FREE(tmp); - - return 0; -} - -/* * run an apparmor_parser command */ static int @@ -340,6 +284,7 @@ create_profile(const char *profile, const char *profile_name, char *pcontent = NULL; char *replace_name = NULL; char *replace_files = NULL; + char *tmp = NULL; const char *template_name = "\nprofile LIBVIRT_TEMPLATE"; const char *template_end = "\n}"; int tlen, plen; @@ -412,19 +357,16 @@ create_profile(const char *profile, const char *profile_name, goto clean_replace; } - if (VIR_ALLOC_N_QUIET(pcontent, plen) < 0) { - vah_error(NULL, 0, _("could not allocate memory for profile")); - goto clean_replace; - } - pcontent[0] = '\0'; - strcpy(pcontent, tcontent); - - if (replace_string(pcontent, plen, template_name, replace_name) < 0) + if (!(pcontent = virStringReplace(tcontent, template_name, replace_name))) goto clean_all; - if ((virtType != VIR_DOMAIN_VIRT_LXC) && - replace_string(pcontent, plen, template_end, replace_files) < 0) - goto clean_all; + if (virtType != VIR_DOMAIN_VIRT_LXC) { + if (!(tmp = virStringReplace(pcontent, template_end, replace_files))) + goto clean_all; + VIR_FREE(pcontent); + pcontent = tmp; + tmp = NULL; + } /* write the file */ if ((fd = open(profile, O_CREAT | O_EXCL | O_WRONLY, 0644)) == -1) { -- 2.8.2

2 2

[libvirt] [PATCH] leave out the default USB controller only on i440fx during migration
by Shivaprasad G Bhat 13 May '16

13 May '16

Further followup discussions in list on commit 192a53e concluded that we should be leaving out the USB controller only for i440fx machines as default USB can be used by someone on q35 at random slots. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 173f82c..5a9b48b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2884,7 +2884,8 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, * with libvirt <= 0.9.4. Limitation doesn't apply to other archs * and can cause problems on PPC64. */ - if (ARCH_IS_X86(def->os.arch) && usb && usb->idx == 0 && usb->model == -1) { + if (ARCH_IS_X86(def->os.arch) && qemuDomainMachineIsI440FX(def) && + usb && usb->idx == 0 && usb->model == -1) { VIR_DEBUG("Removing default USB controller from domain '%s'" " for migration compatibility", def->name); toremove++;

3 2

[libvirt] [PATCH v3 0/4] Introduce big test mock
by Michal Privoznik 13 May '16

13 May '16

diff to v2: - Peter's review suggestions worked in Note that patch 2/4 is ACKed already, but without the rest it makes no sense, so I've not pushed it yet and sending it here for completeness. Michal Privoznik (4): virfile: Introduce virFileRemoveLastComponent tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 9 ++ Makefile.am | 3 + cfg.mk | 2 +- docs/hacking.html.in | 11 ++ src/libvirt_private.syms | 1 + src/util/virfile.c | 17 +++ src/util/virfile.h | 1 + src/util/virstoragefile.c | 6 +- tests/Makefile.am | 28 ++++- tests/check-file-access.pl | 104 ++++++++++++++++ tests/file_access_whitelist.txt | 23 ++++ tests/testutils.c | 32 +++-- tests/testutils.h | 10 +- tests/vircgroupmock.c | 15 +-- tests/virpcimock.c | 14 +-- tests/virtestmock.c | 266 ++++++++++++++++++++++++++++++++++++++++ 17 files changed, 503 insertions(+), 40 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.8.1

2 10

[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

[libvirt] [PATCH v2 0/3] Introduce big test mock
by Michal Privoznik 12 May '16

12 May '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-April/msg01410.html diff to v1: - I've pushed the first patch of the original series - Rebased onto current master (as Jirka's introduction of qemucapsprobe made my patches not applicable). Michal Privoznik (3): tests: Introduce global mock library virtestmock: Print invalid file accesses into a file tests: Introduce check-file-access.pl .gitignore | 1 + HACKING | 11 ++ Makefile.am | 3 + cfg.mk | 8 +- docs/hacking.html.in | 15 +++ tests/Makefile.am | 26 +++- tests/check-file-access.pl | 106 +++++++++++++++ tests/file_access_whitelist.txt | 23 ++++ tests/testutils.c | 34 ++++- tests/testutils.h | 10 +- tests/vircgroupmock.c | 6 +- tests/virpcimock.c | 6 +- tests/virtestmock.c | 279 ++++++++++++++++++++++++++++++++++++++++ 13 files changed, 507 insertions(+), 21 deletions(-) create mode 100755 tests/check-file-access.pl create mode 100644 tests/file_access_whitelist.txt create mode 100644 tests/virtestmock.c -- 2.8.1

2 11