- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/2] Add .domainGetHostname() support for QEMU driver.
by Julio Faracco 01 Sep '18

01 Sep '18

This serie adds a new function into QEMU Guest Agent handlers to use the QEMU command 'guest-get-host-name' to retrieve the domain hostname. This approach requires QEMU-GA running inside the guest, but it is the fastest and easiest way to get this info. Julio Faracco (2): qemu: implementing qemuAgentGetHostname() function. qemu: adding domainGetHostname support for QEMU. src/qemu/qemu_agent.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++++ src/qemu/qemu_driver.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) -- 2.17.1

2 5

[libvirt] [PATCH] virsh: Drop dead variables
by Eric Blake 31 Aug '18

31 Aug '18

The helper function virshSnapshotCreate (formerly vshSnapshotCreate) has had dead variables since commit a00c37f2 (Sep 2011). Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tools/virsh-snapshot.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 812fa91333..a4ea959230 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -50,9 +50,6 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, bool ret = false; virDomainSnapshotPtr snapshot; bool halt = false; - char *doc = NULL; - xmlDocPtr xml = NULL; - xmlXPathContextPtr ctxt = NULL; const char *name = NULL; snapshot = virDomainSnapshotCreateXML(dom, buffer, flags); @@ -101,10 +98,7 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, ret = true; cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); virshDomainSnapshotFree(snapshot); - VIR_FREE(doc); return ret; } -- 2.17.1

1 0

[libvirt] [PATCH] rpc: fix handling of SSH auth failure code
by Daniel P. Berrangé 31 Aug '18

31 Aug '18

The result of libssh2_userauth_password is being assigned to 'ret' in one branch and 'rc' in the other branch. Checks are all done against the 'ret' variable, so one branch never does the correct check. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/rpc/virnetsshsession.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 35dc6c5356..54c3a6f7aa 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -706,9 +706,9 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, if (priv->password) { /* tunelled password authentication */ - if ((ret = libssh2_userauth_password(sess->session, - priv->username, - priv->password)) == 0) { + if ((rc = libssh2_userauth_password(sess->session, + priv->username, + priv->password)) == 0) { ret = 0; goto cleanup; } @@ -737,7 +737,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, goto cleanup; } - if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED) + if (rc != LIBSSH2_ERROR_AUTHENTICATION_FAILED) break; VIR_FREE(password); @@ -750,7 +750,7 @@ virNetSSHAuthenticatePassword(virNetSSHSessionPtr sess, _("authentication failed: %s"), errmsg); /* determine exist status */ - if (ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) + if (rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED) return 1; else return -1; -- 2.17.1

2 2

[libvirt] [PATCH] qemu: mdev: Set vfio device property 'display' to off only if mdev is vfio-pci
by Farhan Ali 31 Aug '18

31 Aug '18

S390 is aware of both vfio-pci and vfio-ccw devices, so on S390 the capability QEMU_CAPS_VFIO_PCI_DISPLAY will be available. Add an extra check to make sure we only set the display to off for vfio-pci mediated devices. Otherwise we add display for vfio-ccw device and this breaks vfio-ccw device qemu command line. Fixes: d54e45b6e conf: Introduce new <hostdev> attribute 'display' Signed-off-by: Farhan Ali <alifm(a)linux.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/qemu/qemu_domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 22c6d8f..df7e937 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6375,6 +6375,7 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc, /* QEMU 2.12 added support for vfio-pci display type, we default to * 'display=off' to stay safe from future changes */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) && + mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI && mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT) mdevsrc->display = VIR_TRISTATE_SWITCH_OFF; -- 2.7.4

2 1

[libvirt] [PATCH 0/5] JSON test improvements
by Ján Tomko 31 Aug '18

31 Aug '18

{ "BLURB": "HERE" } Ján Tomko (5): virjsontest: store name in testInfo virjsontest: use name instead of doc for deflatten test virjsontest: use the test name in AddRemove test Test parsing of large numbers in JSON tests: pass ULLONG_MAX to qemuMonitorJSONGetBalloonInfo tests/qemumonitorjsontest.c | 4 ++-- tests/virjsontest.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) -- 2.16.4

2 10

[libvirt] [PATCH v2 0/2] nwfilter: Fix a couple of session mode issues
by John Ferlan 30 Aug '18

30 Aug '18

v1: https://www.redhat.com/archives/libvir-list/2018-August/msg01464.html Changes in v2 - different approach as review pointed out we should never open the nwfilter driver in session mode (although driver initialization does set up some barebones list infrastructure). First, let's make sure we don't allow creation of the nwfilter filter binding similar to how nwfiler filter creation is not allowed. Second, rather than blindly open the nwfilter during the teardown processing, let's first ensure a filter exists for the network. It's not possible to call instantiation when net->filter == NULL. Rather than alter all the callers, just alter the two teardown API's to check if !net->filter and return prior to opening the nwfilter connection. Since we cannot create a filter nor can we create a binding, this filtering works. Keeps the changes minimal too. John Ferlan (2): nwfilter: Disallow binding creation in session mode nwfilter: Check for filter presence before open connect during teardown src/conf/domain_nwfilter.c | 22 +++++++++++++++------- src/nwfilter/nwfilter_driver.c | 6 ++++++ 2 files changed, 21 insertions(+), 7 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH] storage: Fix mention of disk pool default
by Eric Blake 30 Aug '18

30 Aug '18

The default disk storage pool type is 'dos', not 'msdos'. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I ran into this doc bug when trying to figure out why a disk storage pool that I had copied from another machine wouldn't autostart; it turns out that the old disk used BIOS partitioning (dos), and the new one uses UEFI (gpt). I wonder if it would be nicer if a disk pool without a default partition type supplied by the user could auto-detect the right format, rather than defaulting to dos, but that's a bigger question that I won't be tackling, and wouldn't have necessarily helped me (if the <target> element was already present when I copied the file). docs/storage.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index e9e6ec7423..6ec623831c 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -310,7 +310,7 @@ on the size and placement of volumes. The 'free extents' information will detail the regions which are available for creating new volumes. A volume cannot span across 2 different free extents. - It will default to using <code>msdos</code> as the pool source format. + It will default to using <code>dos</code> as the pool source format. </p> <h3>Example pool input</h3> -- 2.17.1

2 3

[libvirt] [PATCH] qemuDomainAttachNetDevice: use only one virErrorPtr variable
by Ján Tomko 30 Aug '18

30 Aug '18

Commit f7b5566 added 'save_error' even though the function already has 'originalError' used in the 'try_remove' section. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4f290b5648..a30cb1f1a0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1205,7 +1205,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool charDevPlugged = false; bool netdevPlugged = false; char *netdev_name; - virErrorPtr save_error = NULL; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -1487,9 +1486,9 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, qemuDomainReleaseDeviceAddress(vm, &net->info, NULL); if (iface_connected) { - virErrorPreserveLast(&save_error); + virErrorPreserveLast(&originalError); virDomainConfNWFilterTeardown(net); - virErrorRestore(&save_error); + virErrorRestore(&originalError); if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) { ignore_value(virNetDevMacVLanDeleteWithVPortProfile( -- 2.16.4

2 1

[libvirt] [PATCH] virDomainNetDefCheckABIStability: Check for MTU change too
by Michal Privoznik 30 Aug '18

30 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1623157 Changing MTU on a running guest is not possible and trying to do so made us face many problems. That's why we forbid it in 5f44d7e357f61f7. However, there is still one possible path where users can sneak in change: migration XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 38cac07913..59ca9f5888 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21901,6 +21901,13 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src, return false; } + if (src->mtu != dst->mtu) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target network card MTU %d does not match source %d"), + dst->mtu, src->mtu); + return false; + } + if (src->virtio && dst->virtio && !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) return false; -- 2.16.4

2 1

[libvirt] [PATCH] qemuDomainSnapshotCreateActiveExternal: Remove memory snapshot on failure less frequently
by Michal Privoznik 30 Aug '18

30 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1589115 When creating a memory snapshot the domain is suspended and qemu is told to dump memory into the desired file. After that we set a flag so that the file is not left behind if a failure occurs at some later point (e.g. when creating disk snapshot fails). However, the way we currently handle the memory snapshot file is way too aggressive. For instance, if resuming domain vCPUs fails after all snapshots were done successfully, we still remove the memory snapshot (even though we leave disk snapshot be). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..2eae3dd49d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15248,6 +15248,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, virObjectEventStateQueue(driver->domainEventState, event); } + memory_unlink = false; ret = 0; cleanup: -- 2.16.4

2 3

[libvirt] Entering freeze for libvirt-4.7.0
by Daniel Veillard 30 Aug '18

30 Aug '18

Sorry I forgot to announce it but we are the last week of the month, so it's about time, I tagged RC1 in git and pushed the signed tarball and rpms to the usual place earlier today: ftp://libvirt.org/libvirt/ this seems to work well in my limited testing but as usual we need more review and check on other platforms or OSes before the release. In general https://ci.centos.org/view/libvirt/ is green except for glib bindings and for the master build (weird!) I will likely push the rc2 Thursday morning, but I mwill be travelling at the end of the week so that may depends on conditions, and hopefully the release during this w.e. thanks for giving it a try ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH for v4.7.0] virDomainDefCompatibleDevice: Relax alias change check
by Michal Privoznik 29 Aug '18

29 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1621910 When introducing this check back in 4ad54a417a1 my mindset was that if an element is missing in update XML then user is requesting for removal of the corresponding setting. For instance, if <bandwidth/> is not present in update XML any QoS previously set on <interface/> is cleared out. Well this assumption is correct but only to some extent. Turns out, we have some lazy users who when updating path to ISO image construct very minimalistic disk XML and pass it to device update API. Such XML is lacking a lot of information, and alias is one of them. This triggers error in virDomainDefCompatibleDevice() because we think that user is requesting to remove the alias. Well, they are not. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 38cac07913..603a4ad652 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28785,9 +28785,9 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, if (action == VIR_DOMAIN_DEVICE_ACTION_UPDATE && live && - ((!!data.newInfo != !!data.oldInfo) || - (data.newInfo && data.oldInfo && - STRNEQ_NULLABLE(data.newInfo->alias, data.oldInfo->alias)))) { + (data.newInfo && data.oldInfo && + data.newInfo->alias && data.oldInfo->alias && + STRNEQ(data.newInfo->alias, data.oldInfo->alias))) { virReportError(VIR_ERR_OPERATION_DENIED, "%s", _("changing device alias is not allowed")); return -1; -- 2.16.4

2 1

[libvirt] [PATCH] virDomainDetachDeviceFlags: Clarify update semantics
by Michal Privoznik 29 Aug '18

29 Aug '18

https://bugzilla.redhat.com/show_bug.cgi?id=1621910 When users want to update a path to a CDROM they tend to construct a very minimal XML and feed the API with it. This is not a good practice as it breaks the assumptions the API is built on. Most notably, leaving an element out should be treated as a request for removal of the corresponding setting. Just like leaving out <bandwidth/> clears out any QoS previously set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ef460277f7..bd8ca6eff2 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8318,6 +8318,14 @@ virDomainDetachDeviceFlags(virDomainPtr domain, * media, altering the graphics configuration such as password, * reconfiguring the NIC device backend connectivity, etc. * + * The supplied XML description of the device should contain all + * the information that are found in corresponding domain XML. + * Leaving out any piece of information is treated as request for + * its removal, which may be denied. For instance, when users + * want to change CDROM media only for live XML, they must + * provide live disk XML as found in corresponding live domain + * XML with only the disk path changed. + * * Returns 0 in case of success, -1 in case of failure. */ int -- 2.16.4

3 3

[libvirt] [PATCH] qemu: domain: validate memory access during validate domain config
by Luyao Huang 29 Aug '18

29 Aug '18

commit 6534b3c4 try to raise an error when there is no numa nodes but set access='shared' in domain config. In that commit, we add a memory access validate function for memory device, but this check is not related to memory device and won't work if there is no memory device in guest xml. Move the memory access related check in the domain config validate function, and simplify the unit test xml to avoid other error. https://bugzilla.redhat.com/show_bug.cgi?id=1448149#c14 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_domain.c | 55 +++++++++++----------- tests/qemuxml2argvdata/hugepages-memaccess3.xml | 62 +------------------------ tests/qemuxml2argvtest.c | 6 +-- 3 files changed, 32 insertions(+), 91 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f570081..f0c461b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3888,6 +3888,29 @@ qemuDomainDefValidateFeatures(const virDomainDef *def, static int +qemuDomainDefValidateMemory(const virDomainDef *def) +{ + const long system_page_size = virGetSystemPageSizeKB(); + + /* We can't guarantee any other mem.access + * if no guest NUMA nodes are defined. */ + if (def->mem.nhugepages != 0 && + def->mem.hugepages[0].size != system_page_size && + virDomainNumaGetNodeCount(def->numa) == 0 && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory access mode '%s' not supported " + "without guest numa node"), + virDomainMemoryAccessTypeToString(def->mem.access)); + return -1; + } + + return 0; +} + + +static int qemuDomainDefValidate(const virDomainDef *def, virCapsPtr caps ATTRIBUTE_UNUSED, void *opaque) @@ -4009,6 +4032,9 @@ qemuDomainDefValidate(const virDomainDef *def, if (qemuDomainDefValidateFeatures(def, qemuCaps) < 0) goto cleanup; + if (qemuDomainDefValidateMemory(def) < 0) + goto cleanup; + ret = 0; cleanup: @@ -5531,30 +5557,6 @@ qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, static int -qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNUSED, - const virDomainDef *def) -{ - const long system_page_size = virGetSystemPageSizeKB(); - - /* We can't guarantee any other mem.access - * if no guest NUMA nodes are defined. */ - if (def->mem.nhugepages != 0 && - def->mem.hugepages[0].size != system_page_size && - virDomainNumaGetNodeCount(def->numa) == 0 && - def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && - def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory access mode '%s' not supported " - "without guest numa node"), - virDomainMemoryAccessTypeToString(def->mem.access)); - return -1; - } - - return 0; -} - - -static int qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock, const virDomainDef *def, virQEMUCapsPtr qemuCaps) @@ -5712,10 +5714,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, qemuCaps); break; - case VIR_DOMAIN_DEVICE_MEMORY: - ret = qemuDomainDeviceDefValidateMemory(dev->data.memory, def); - break; - case VIR_DOMAIN_DEVICE_VSOCK: ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, def, qemuCaps); break; @@ -5737,6 +5735,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_NONE: diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml index 8ec38d8..43c3ec6 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.xml +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml @@ -12,76 +12,18 @@ <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> <bootmenu enable='yes'/> </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> <cpu mode='host-model' check='partial'> <model fallback='allow'/> </cpu> - <clock offset='variable' adjustment='500' basis='utc'> - <timer name='rtc' tickpolicy='catchup'/> - <timer name='pit' tickpolicy='delay'/> - <timer name='hpet' present='no'/> - </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> - <pm> - <suspend-to-mem enabled='yes'/> - <suspend-to-disk enabled='yes'/> - </pm> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2' discard='unmap'/> - <source file='/var/lib/libvirt/images/fedora.qcow2'/> - <target dev='sda' bus='scsi'/> - <boot order='1'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='usb' index='0' model='piix3-uhci'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> + <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> - <controller type='scsi' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </controller> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <serial type='pty'> - <target type='isa-serial' port='1'> - <model name='isa-serial'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='1'/> - </console> - <channel type='unix'> - <target type='virtio' name='org.qemu.guest_agent.0'/> - <address type='virtio-serial' controller='0' bus='0' port='1'/> - </channel> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> - <listen type='address' address='0.0.0.0'/> - </graphics> - <graphics type='spice'> - <listen type='socket' socket='/tmp/spice.sock'/> - </graphics> - <video> - <model type='virtio' heads='1' primary='yes'> - <acceleration accel3d='yes'/> - </model> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> - </video> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> + <memballoon model='none'/> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0e9eef6..6b55316 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1023,9 +1023,9 @@ mymain(void) DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); - DO_TEST_FAILURE("hugepages-memaccess3", - QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("hugepages-memaccess3", + QEMU_CAPS_OBJECT_MEMORY_RAM, + QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); -- 1.8.3.1

3 3

[libvirt] [PATCH -v2 0/1] esx: Fix get/set vcpus
by Marcos Paulo de Souza 29 Aug '18

29 Aug '18

Hi guys, this is the second version of the patch, the first one can be found here[1]. This version addresses the comments from Matthias Bolte, making the change simpler and cleaner. Let me know if there are other details that needs to change. [1]: https://www.redhat.com/archives/libvir-list/2018-August/msg00532.html Marcos Paulo de Souza (1): esx: Make esxDomainGetVcpusFlags check flags src/esx/esx_driver.c | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 24 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH] vsh-table: Fix broken build on centos and rhel
by Simon Kobyda 29 Aug '18

29 Aug '18

The reason of broken build was that centos and rhel use older version of glibc. These versions of glibc on these platforms cannot work with newer unicodes, therefore functions iswprint() and wcwidth() failed. So I replaced them with older unicode characters. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- tests/vshtabletest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index 1b07c37c56..9e9c045226 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -123,7 +123,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) " Id 名稱 государство \n" "-----------------------------------------\n" " 1 fedora28 running \n" -" 2 🙊🙉🙈rhel7.5🙆🙆🙅 running \n"; +" 2 つへソrhel7.5つへソ running \n"; vshTablePtr table; table = vshTableNew("Id", "名稱", "государство", NULL); @@ -131,7 +131,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) goto cleanup; vshTableRowAppend(table, "1", "fedora28", "running", NULL); - vshTableRowAppend(table, "2", "🙊🙉🙈rhel7.5🙆🙆🙅", "running", + vshTableRowAppend(table, "2", "つへソrhel7.5つへソ", "running", NULL); act = vshTablePrintToString(table, true); -- 2.17.1

4 3

[libvirt] [PATCH] tests: Properly reset mocked CPU model
by Jiri Denemark 29 Aug '18

29 Aug '18

When switching the host architecture to something for which we do not have any host CPU model defined, the mocked virQEMUCapsProbeHostCPUForEmulator would just return the previous CPU model resulting in strange combinations, such as "core2duo" host CPU model in QEMU capabilities for "AArch64" architecture. It currently doesn't break any test case, but we should fix it anyway to avoid future surprises which would be quite hard to debug. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/testutilsqemu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8438613f28..52ea6bf655 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -575,6 +575,8 @@ qemuTestSetHostCPU(virCapsPtr caps, setenv("VIR_TEST_MOCK_FAKE_HOST_CPU", cpu->model, 1); else unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); + } else { + unsetenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); } caps->host.cpu = cpu; } -- 2.18.0

2 1

[libvirt] clean/simple Q35 support in libvirt+QEMU for guest OSes that don't support virtio-1.0
by Laine Stump 29 Aug '18

29 Aug '18

(Several of us started an offline discussion on this topic, and it quickly became complicated, so we decided it should continue upstream. Here is a synopsis of the discussion so far (as *I've* interpreted it, so corrections are welcome and apologies in advance for anything I got wrong!) Some of the things are stated here as givens, but feel free to rip them apart.) Summary of the problem: 1) We want to persuade libvirt+QEMU users to move away from the i440fx machinetype in favor of Q35. (NB: Someday this *might* lead to the ability to deprecate and even remove the 440fx machinetype, but even if that were to happen, it would be a *very long* time from now, so this discussion is *not* about that!) 2) When Q35 machinetype is used, libvirt assigns virtio devices to a slot on a PCI Express controller (because why have modern PCIe controllers/slots available but force everything onto clunky old legacy controllers?). 3) When a virtio device is plugged into an Express controller, QEMU disables the device's IO port space, and it is put into "modern-only" mode (this is done to avoid a rapid exhaustion of limited IO port space). 4) modern-only virtio devices won't work with a legacy (virtio-0.9-only) guest driver, because virtio-0.9 requires IO port space. 5) Some guest OSes that we still want to support (and which would otherwise work okay on a Q35 virtual machine) have virtio drivers too old to support virtio-1.0 (CentOS6 and RHEL6 are examples of such OSes), but due to the chain of reasons listed above, the "standard" config for a Q35 guest generated by libvirt doesn't support virtio-0.9, hence doesn't support these guest OSes. And here's a list of possible solutions to this problem (note that "consumers" means management applications such as OpenStack, oVirt, virt-manager, virt-install, gnome-boxes, etc. In all cases, it's assumed that the consumer's decision on the action to take will be based on information from libosinfo). For completeness, I've included even the possibilities that have been rejected, along with a brief synopsis of (at least part of) the reason for rejection: (1) Add some way libvirt consumers can ask libvirt to place virtio devices on a legacy pci slot instead of pcie when the machinetype is q35 (qemu sets virtio devices in legacy PCI slots to transitional mode, so io port space is enabled and virtio-0.0 drivers will work). This has been proposed on libvir-list, but rejected. Here is the most elquently stated reasoning for the rejection I could find (with thanks to Dan Berrange): The domain XML is a way to express the configuration of the guest virtual machine. What we're talking about here is a policy tunable for an internal libvirt QEMU driver algorithm, as so does not belong anywhere in the domain XML. (2) Add full-blown pci enumeration support to all libvirt consumers (i.e. they will need to build a model of the PCI bus topology of each guest, and keep track of which addresses are in use). They can then manually place virtio devices on legacy pci slots (again, triggering transitional mode) when the intended guest OS doesn't support virtio-0.9. (This is seen as requiring too much duplicated effort for development and support/maintenance, since up until now libvirt has been the single point of action for PCI address assignment (well, QEMU can do it too, but for > 10 years libvirt has *always* provided full PCI addresses for all devices) (3) Add virtio-1.0 support to all guest OSes. If this is done, existing libvirt configs will work. (Aside from the difficulty of backporting, and the fact that there are going to be some OSes that don't get it *at all*, there will always be older releases that haven't gotten the backport. So this isn't a complete solution). (4) Consumers can continue using the 440fx machinetype for guest OSes that don't support virtio-0.9 (This would work, but perpetuates use of the 440fx machinetype, and all for just this one reason (at least in the case of CentOS6/RHEL6, which otherwise work just fine with Q35)). (5) Introduce virtio-0.9, virtio-1.0 models in libvirt which are explicitly legacy-only and modern-only. QEMU doesn't need to change, as libvirt can simply set the right params on existing QEMU models to force the behavior. (NB: it's unclear to me whether virtio-0.9 simply won't work without forcing the device to be on a legacy PCI slot, or if that's just "a very bad idea" because it will mean that the device uses up extra io port space) The offline discussion had basically come to the point of saying that options (4) and (5) were the only reasonable ones, with option (5) being preferred (I think). As a starter for continuing the discussion, it seems to me that for option (5): a) we don't really need the virtio-1.0 model, since that's what you currently get anyway when you ask for "virtio" on Q35 (and on 440fx, "virtio" gives you transitional, which works for everybody). b) Rather than a "legacy-only" model for virtio-0.9, it would be more useful to have "transitional". This way the config would work for older OSes that don't support virtio-1.0, and when/if the OS was upgraded such that it supported virtio-1.0, that would be automatically used without needing to change the config. c) Even if it's possible to force a device on an Express slot into transitional mode, this is extremely wasteful of io port space, so libvirt should consider virtio-0.9 devices to be legacy PCI, and thus plug them into legacy PCI slots. And once we're doing this, it's unnecessary to add any extra option to the qemu commandline to force legacy support (i.e. transitional mode), as that is what QEMU already does when the device is connected to a legacy PCI slot. So making the naive assumption that we agree on implementing option (5) and there are no objections to my points a-c (Hah! As if!), how does this sound as a plan: A) libosinfo starts telling consumers that the preferred virtio device model for the relevant OSes is "virtio-0.9", and leaves the recommendation for other OSes as "virtio". B) libvirt adds a "virtio-0.9" model for all virtio devices that actually have virtio-0.9 support (a couple of devices never existed prior to virtio-1.0 (rng and ???) so virtio-0.9 would be nonsensical for them). C) inside libvirt, the implementation of the "virtio-0.9" model is identical to "virtio", except that the VIR_PCI_CONNECT_TYPE flags for these devices contain VIR_PCI_CONNECT_TYPE_PCI rather than VIR_PCI_CONNECT_TYPE_PCIE, resulting in those devices being assigned to a legacy PCI slot, and thus they would be transitional mode by default. (If there is disagreement about putting these devices on a legacy PCI slot, then (C) could be changed to add "disable-legacy=off" to the qemu commandline. But again, even if that works, it would use up 4k of IO port space for each device, causing it to rapidly run out, and I don't think that should be the default mode of operation).

7 25

[libvirt] [PATCH v2 0/8] storage: Resolve some locking issues
by Michal Privoznik 29 Aug '18

29 Aug '18

Technically, this is a v2 of: https://www.redhat.com/archives/libvir-list/2018-August/msg00624.html but majority of the patches are new. The review of the patch from above made me look into storage pool locking more and I have found some issues. For best view of the patches (esp. 4/8 use --histogram option). Michal Prívozník (8): storage_backend_rbd: Drop ATTRIBUTE_UNUSED for arguments that are used virstorageobj: Move virStoragePoolObjIsDuplicate up virstorageobj: Check for duplicates from virStoragePoolObjAssignDef virstorageobj: Move virStoragePoolObjSourceFindDuplicate and friends up virStoragePoolObjSourceFindDuplicate: Drop @conn argument virstorageobj: Check for source duplicates from virStoragePoolObjAssignDef storage_driver: Mark volume as 'in use' for some operations storage_driver: Release pool object lock for some long running jobs src/conf/virstorageobj.c | 937 +++++++++++++++-------------- src/conf/virstorageobj.h | 13 +- src/libvirt_private.syms | 2 - src/storage/storage_backend_iscsi_direct.c | 6 +- src/storage/storage_backend_rbd.c | 12 +- src/storage/storage_driver.c | 56 +- src/test/test_driver.c | 12 +- 7 files changed, 529 insertions(+), 509 deletions(-) -- 2.16.4

2 19

[libvirt] [PATCH v4 00/12] PCI passthrough support on s390
by Yi Min Zhao 29 Aug '18

29 Aug '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 3b89e1f962 docs: api_extension: Don't encourage other tools than git Change Log ========== v3->v4: 1. Update docs. 2. Format code style. 3. Optimize zPCI support check. 4. Move the check of zPCI defined in xml but unsupported by Qemu to qemuDomainDeviceDefValidate(). 5. Change zpci address member of PCI address struct from pointer to instance. 6. Modify zpci address definition principle. Currently the user must either define both of uid and fid or not. v2->v3: 1. Revise code style. 2. Update test cases. 3. Introduce qemuDomainCollectPCIAddressExtension() to collect PCI extension addresses. 4. Introduce virDeviceInfoPCIAddressExtensionPresent() to check if zPCI address exists. 5. Optimize zPCI address check logic. 6. Optimize passed parameters of zPCI addr alloc/release/reserve functions. 7. Report enum range error in qemuDomainDeviceSupportZPCI(). 8. Update commit messages. v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes cfg.mk | 1 + docs/formatdomain.html.in | 9 +- docs/news.xml | 10 + docs/schemas/basictypes.rng | 23 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 62 ++++ src/conf/device_conf.h | 14 + src/conf/domain_addr.c | 331 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 95 ++++++ src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 27 ++ src/qemu/qemu_domain_address.c | 205 ++++++++++++- src/qemu/qemu_hotplug.c | 151 +++++++++- src/util/virpci.h | 11 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 26 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 ++ .../hostdev-vfio-zpci-autogenerate.args | 25 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 29 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 39 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 +++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 25 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 20 ++ tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ .../hostdev-vfio-zpci-autogenerate.xml | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 42 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 79 +++++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 17 ++ 42 files changed, 1518 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

3 18

[libvirt] [PATCH] virDomainObjListAddLocked: fix double free
by Marc Hartmayer 29 Aug '18

29 Aug '18

If @vm has flagged as "to be removed" virDomainObjListFindByNameLocked returns NULL (although the definition actually exists). Therefore, the possibility exits that "virHashAddEntry" will raise the error "Duplicate key" => virDomainObjListAddObjLocked fails => virDomainObjEndAPI(&vm) is called and this leads to a freeing of @def since @def is already assigned to vm->def. But actually this leads to a double free since the common usage pattern is that the caller of virDomainObjListAdd(Locked) is responsible for freeing @def in case of an error. Let's fix this by setting vm->def to NULL in case of an error. Backtrace: ➤ bt #0 virFree (ptrptr=0x7575757575757575) #1 0x000003ffb5b25b3e in virDomainResourceDefFree #2 0x000003ffb5b37c34 in virDomainDefFree #3 0x000003ff9123f734 in qemuDomainDefineXMLFlags #4 0x000003ff9123f7f4 in qemuDomainDefineXML #5 0x000003ffb5cd2c84 in virDomainDefineXML #6 0x000000011745aa82 in remoteDispatchDomainDefineXML ... Reviewed-by: Bjoern Walk <bwalk(a)linux.ibm.com> Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com> --- src/conf/virdomainobjlist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 52171594f34f..805fe9440afe 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -329,8 +329,10 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, goto cleanup; vm->def = def; - if (virDomainObjListAddObjLocked(doms, vm) < 0) + if (virDomainObjListAddObjLocked(doms, vm) < 0) { + vm->def = NULL; goto error; + } } cleanup: return vm; -- 2.13.4

4 4

[libvirt] [PATCH v3] virsh: Don't break loop of domblkinfo for disks
by Han Han 28 Aug '18

28 Aug '18

Fix logical error in v2: https://www.redhat.com/archives/libvir-list/2018-August/msg01358.html https://bugzilla.redhat.com/show_bug.cgi?id=1619625 --all option is added to cmdDomblkinfo since commit 62c39193 allowing to show all block devices info. Reset error when empty source in case error breaks the loop of domblkinfo for disks. Signed-off-by: Han Han <hhan(a)redhat.com> --- tools/virsh-domain-monitor.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b9b4f9739b..ecb98d4128 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -475,6 +475,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) int ndisks; size_t i; xmlNodePtr *disks = NULL; + char *source = NULL; char *target = NULL; char *protocol = NULL; @@ -505,18 +506,20 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < ndisks; i++) { ctxt->node = disks[i]; + source = virXPathString("string(./source)", ctxt); protocol = virXPathString("string(./source/@protocol)", ctxt); target = virXPathString("string(./target/@dev)", ctxt); rc = virDomainGetBlockInfo(dom, target, &info, 0); if (rc < 0) { - /* If protocol is present that's an indication of a networked - * storage device which cannot provide statistics, so generate - * 0 based data and get the next disk. */ - if (protocol && !active && + /* For the case of empty cdrom, networked disk which cannot + * provide statistics, generate 0 based data and get the next + * disk. + */ + if (!source || (protocol && !active && virGetLastErrorCode() == VIR_ERR_INTERNAL_ERROR && - virGetLastErrorDomain() == VIR_FROM_STORAGE) { + virGetLastErrorDomain() == VIR_FROM_STORAGE)) { memset(&info, 0, sizeof(info)); vshResetLibvirtError(); } else { @@ -526,6 +529,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cmdDomblkinfoPrint(ctl, &info, target, human, false); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); } @@ -540,6 +544,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) cleanup: virshDomainFree(dom); + VIR_FREE(source); VIR_FREE(target); VIR_FREE(protocol); VIR_FREE(disks); -- 2.18.0

2 1

[libvirt] [PATCH] qemu: Introduce 16550A serial console model
by Andrea Bolognani 28 Aug '18

28 Aug '18

None of the existing models is suitable for use with RISC-V virt guests, and we don't want information about the serial console to be missing from the XML. The name is based on comments in qemu/hw/riscv/virt.c: RISC-V machine with 16550a UART and VirtIO MMIO and in qemu/hw/char/serial.c: QEMU 16550A UART emulation along with the output of dmesg in the guest: Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled 10000000.uart: ttyS0 at MMIO 0x10000000 (irq = 13, base_baud= 230400) is a 16550A Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- CC'ing Rich mostly so that he can double-check the name choice is sensible. docs/formatdomain.html.in | 12 +++++----- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 12 ++++++++++ src/qemu/qemu_domain.c | 27 ++++++++++++++++------- tests/qemuxml2xmloutdata/riscv64-virt.xml | 4 +++- 7 files changed, 44 insertions(+), 14 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0cbf570a13..eb619a1656 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7011,7 +7011,8 @@ qemu-kvm -net nic,model=? /dev/null is available) and <code>pci-serial</code> (usable whenever PCI support is available); <span class="since">since 3.10.0</span>, <code>spapr-vio-serial</code> (usable with ppc64/pseries guests), - <code>system-serial</code> (usable with aarch64/virt guests) and + <code>system-serial</code> (usable with aarch64/virt and, + <span class="since">since 4.7.0</span>, riscv/virt guests) and <code>sclp-serial</code> (usable with s390 and s390x guests) are available as well. </p> @@ -7025,10 +7026,11 @@ qemu-kvm -net nic,model=? /dev/null target type); <code>pci-serial</code> (usable with the <code>pci-serial</code> target type); <code>spapr-vty</code> (usable with the <code>spapr-vio-serial</code> - target type); <code>pl011</code> (usable with the - <code>system-serial</code> target type); <code>sclpconsole</code> and - <code>sclplmconsole</code> (usable with the <code>sclp-serial</code> - target type). + target type); <code>pl011</code> and, + <span class="since">since 4.7.0</span>, <code>16550a</code> (usable + with the <code>system-serial</code> target type); + <code>sclpconsole</code> and <code>sclplmconsole</code> (usable with + the <code>sclp-serial</code> target type). </p> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f176538195..3796eb4b5e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3733,6 +3733,7 @@ <value>pci-serial</value> <value>spapr-vty</value> <value>pl011</value> + <value>16550a</value> <value>sclpconsole</value> <value>sclplmconsole</value> </choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bde9fef914..8af59bb4bb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -493,6 +493,7 @@ VIR_ENUM_IMPL(virDomainChrSerialTargetModel, "pl011", "sclpconsole", "sclplmconsole", + "16550a", ); VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c0ad072db5..8a3673361a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1133,6 +1133,7 @@ typedef enum { VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE, + VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A, VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST } virDomainChrSerialTargetModel; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fd9e58fd5d..f63e35444e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9149,6 +9149,7 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel) return QEMU_CAPS_DEVICE_SCLPLMCONSOLE; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: return QEMU_CAPS_DEVICE_PL011; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: break; @@ -9189,6 +9190,16 @@ qemuChrIsPlatformDevice(const virDomainDef *def, } } + if (ARCH_IS_RISCV(def->os.arch)) { + + /* 16550a (used by riscv/virt guests) is a platform device */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM && + chr->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A) { + return true; + } + } + /* If we got all the way here and we're still stuck with the default * target type for a serial device, it means we have no clue what kind of * device we're talking about and we must treat it as a platform device. */ @@ -10579,6 +10590,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: /* Except from _LAST, which is just a guard value and will never diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fbb72..1cc4cefbd1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4183,6 +4183,7 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel) case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: @@ -4248,6 +4249,7 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr) case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A: expected = qemuDomainChrSerialTargetModelToTargetType(chr->targetModel); @@ -4298,18 +4300,23 @@ qemuDomainChrDefValidate(const virDomainChrDef *dev, if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { bool isCompatible = true; + if (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM) { + if (dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011 && + !qemuDomainIsARMVirt(def)) { + isCompatible = false; + } + if (dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A && + !qemuDomainIsRISCVVirt(def)) { + isCompatible = false; + } + } + if (!qemuDomainIsPSeries(def) && (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO || dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY)) { isCompatible = false; } - if (!qemuDomainIsARMVirt(def) && - (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM || - dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011)) { - isCompatible = false; - } - if (!ARCH_IS_S390(def->os.arch) && (dev->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP || dev->targetModel == VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE || @@ -6129,7 +6136,7 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA; } else if (qemuDomainIsPSeries(def)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR_VIO; - } else if (qemuDomainIsARMVirt(def)) { + } else if (qemuDomainIsARMVirt(def) || qemuDomainIsRISCVVirt(def)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM; } else if (ARCH_IS_S390(def->os.arch)) { chr->targetType = VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; @@ -6153,7 +6160,11 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY; break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SYSTEM: - chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; + if (qemuDomainIsARMVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011; + } else if (qemuDomainIsRISCVVirt(def)) { + chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_16550A; + } break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE; diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.xml b/tests/qemuxml2xmloutdata/riscv64-virt.xml index 822a59a604..daf9ca4978 100644 --- a/tests/qemuxml2xmloutdata/riscv64-virt.xml +++ b/tests/qemuxml2xmloutdata/riscv64-virt.xml @@ -24,7 +24,9 @@ </disk> <controller type='usb' index='0'/> <serial type='pty'> - <target port='0'/> + <target type='system-serial' port='0'> + <model name='16550a'/> + </target> </serial> <console type='pty'> <target type='serial' port='0'/> -- 2.17.1

3 4

[libvirt] [PATCH] qemu: Add more defaults for RISC-V virt guests
by Andrea Bolognani 28 Aug '18

28 Aug '18

We would have used virtio for networking anyway, but it's better to be explicit; for graphics, none of the existing models work right now but virtio is the only one which has a non-PCI variant, so it's as good a default as any. Spotted-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 22c6d8f090..2410add9c2 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5840,6 +5840,10 @@ qemuDomainDefaultNetModel(const virDomainDef *def, return "lan9118"; } + /* virtio is a sensible default for RISC-V virt guests */ + if (qemuDomainIsRISCVVirt(def)) + return "virtio"; + /* In all other cases the model depends on the capabilities. If they were * not provided don't report any default. */ if (!qemuCaps) @@ -6326,7 +6330,9 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsARMVirt(def) || ARCH_IS_S390(def->os.arch)) + else if (qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def) || + ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; else video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; -- 2.17.1

2 1

[libvirt] [PATCH] qemu: Don't use legacy USB for RISC-V guests
by Andrea Bolognani 28 Aug '18

28 Aug '18

The architecture is new enough that we don't need to concern ourselves with backwards compatibility in any capacity. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Requires https://www.redhat.com/archives/libvir-list/2018-June/msg01223.html to be applied (and test data to be refreshed in the process). src/qemu/qemu_command.c | 4 +++- tests/qemuxml2argvdata/riscv64-virt.args | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 88d698e262..bac7c938ab 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3046,7 +3046,8 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && !qemuDomainIsQ35(def) && - !qemuDomainIsARMVirt(def)) { + !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def)) { /* An appropriate default USB controller model should already * have been selected in qemuDomainDeviceDefPostParse(); if @@ -3085,6 +3086,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, if (usbcontroller == 0 && !qemuDomainIsQ35(def) && !qemuDomainIsARMVirt(def) && + !qemuDomainIsRISCVVirt(def) && !ARCH_IS_S390(def->os.arch)) { /* We haven't added any USB controller yet, but we haven't been asked * not to add one either. Add a legacy USB controller, unless we're diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args index 0e103a6755..a373ff2b92 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.args @@ -21,7 +21,6 @@ server,nowait \ -no-shutdown \ -kernel /var/lib/libvirt/images/bbl \ -append 'console=ttyS0 ro root=/dev/vda' \ --usb \ -drive file=/var/lib/libvirt/images/stage4-disk.img,format=raw,if=none,\ id=drive-virtio-disk0 \ -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -- 2.17.1

2 1