- Devel - libvirt List Archives

[RFC PATCH 0/2] Handle physical address bits
by Dario Faggioli 05 Nov '20

05 Nov '20

Hello everyone, These patches let one specify how wide the physical addresses are, in bits. Using current QEMU's default of 40 may limit the amount of RAM the guest can see (which is the reason why, in our packages, we bump that to 42; and as far as I've understood from reading some old mailing list threads on the subject, other downstreams do something similar). It also can cause other problems, such as the one described in: https://bugzilla.redhat.com/show_bug.cgi?id=1578278#c5 Basically, the VM thinking and reporting to the user that L1TF is unmitigated, because while its RAM may fits in MAX_PHYS_ADDR (e.g., equal to 42 or 40) it does not fit in MAX_PHYS_ADDR/2, which is necessary for PTE inversion to be effective. I've also mentioned this during my KVM Forum talk (slides 81, 82, from here: http://xenbits.xen.org/people/dariof/talks/Virtual%20Topology%20Friend%20or…) The series alleviates the problem by providing an user with an easy way to either specify an arbitrary number of physical address bits bits for the VM (with, e.g., <maxphysaddr mode='emulate' bits='42'/>) or just using the same number of bits of the host (with <maxphysaddr mode='passthrough'/>). This in theory is already possible, but only in an hack-ish way, such as adding: <qemu:commandline> <qemu:arg value='-cpu'/> <qemu:arg value='host,host-phys-bits=on'/> </qemu:commandline> But this is super inconvenient. :-) I have not done it such as host-phys-bits=on is automatically added when using cpu-passthrough as CPU model, as I think that that actually belongs in QEMU. Basically, this works and can be used very much like the <cache/> element. Ah, so, the series is RFC basically because the QEMU capability test is failing. I think I may be failing at understanding how things should work. Or maybe I "just" need to regenerate the files against which capabilities themselves are checked (and if this is the case, I need to understand how). Well, I'll keep looking into this, and try to figure it out (but, if anyone has any hint, that's much appreciated :-P). Feedback welcome. Thanks and Regards --- Dario Faggioli (2): Add support for specifying max physical address size. qemu: Add support for max physical address size src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 +++++++++++ src/qemu/qemu_domain.c | 46 +++++++++++++++++++ .../cpu-phys-bits-emulate.args | 29 ++++++++++++ .../cpu-phys-bits-emulate.xml | 20 ++++++++ .../cpu-phys-bits-emulate2.args | 30 ++++++++++++ .../cpu-phys-bits-emulate2.xml | 20 ++++++++ .../cpu-phys-bits-emulate3.err | 1 + .../cpu-phys-bits-emulate3.xml | 20 ++++++++ .../cpu-phys-bits-passthrough.args | 29 ++++++++++++ .../cpu-phys-bits-passthrough.xml | 20 ++++++++ .../cpu-phys-bits-passthrough2.err | 1 + .../cpu-phys-bits-passthrough2.xml | 20 ++++++++ .../cpu-phys-bits-passthrough3.err | 1 + .../cpu-phys-bits-passthrough3.xml | 20 ++++++++ tests/qemuxml2argvtest.c | 7 +++ 17 files changed, 295 insertions(+) create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml -- Dario Faggioli, Ph.D http://about.me/dario.faggioli Virtualization Software Engineer SUSE Labs, SUSE https://www.suse.com/ ------------------------------------------------------------------- <<This happens because _I_ choose it to happen!>> (Raistlin Majere)

3 14

[PATCH 00/10] Make mdev_types generic and support it on CSS devices
by Boris Fiuczynski 05 Nov '20

05 Nov '20

Since channel subsystem devices can have the capability to create an mdev device they should expose this by listing the mdev_types capability. Many patches of this series is concerned with refactoring existing PCI code. Boris Fiuczynski (10): conf: node_device: fix mdev_types format and XML parsing code to match schema util: refactor mdev_types method from PCI to mdev util: refactor mdev_types methods return code usage conf: node_devive: refactor GetPCIMdevTypesCaps into GetMdevTypeCapes conf: node_device: refactor capability mdev_types formating conf: node_device: refactor mdev_types XML parsing conf: node_device: refactor CSS formating schema: refactor mdev_types out of PCI nodedev schema conf: node_device: cleanup virNodeDevCapCCWParseXML node_device: detecting mdev_types capability on CSS devices docs/drvnodedev.html.in | 5 +- docs/formatnode.html.in | 39 ++ docs/schemas/nodedev.rng | 52 ++- src/conf/node_device_conf.c | 365 ++++++++++++------ src/conf/node_device_conf.h | 11 + src/conf/virnodedeviceobj.c | 7 +- src/libvirt_private.syms | 3 +- src/node_device/node_device_udev.c | 3 + src/util/virmdev.c | 67 ++++ src/util/virmdev.h | 5 + src/util/virpci.c | 60 --- src/util/virpci.h | 3 - .../css_0_0_fffe_mdev_types.xml | 17 + tests/nodedevxml2xmltest.c | 1 + 14 files changed, 428 insertions(+), 210 deletions(-) create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types.xml -- 2.25.1

3 21

[PATCH] virsh-domain: Remove unused virshNodeIsSuperset
by Yi Li 05 Nov '20

05 Nov '20

The function is marked as unused. Remove it from the tree until a new use case can be found. Signed-off-by: Yi Li <yili(a)winhong.com> --- tools/virsh-domain.c | 115 ------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ef347585e8..1ae936c6b2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11933,121 +11933,6 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) return true; } -/** - * Check if n1 is superset of n2, meaning n1 contains all elements and - * attributes as n2 at least. Including children. - * @n1 first node - * @n2 second node - * returns true in case n1 covers n2, false otherwise. - */ -G_GNUC_UNUSED -static bool -virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) -{ - xmlNodePtr child1, child2; - xmlAttrPtr attr; - char *prop1, *prop2; - bool found; - bool visited; - bool ret = false; - long n1_child_size, n2_child_size, n1_iter; - virBitmapPtr bitmap; - - if (!n1 && !n2) - return true; - - if (!n1 || !n2) - return false; - - if (!xmlStrEqual(n1->name, n2->name)) - return false; - - /* Iterate over n2 attributes and check if n1 contains them */ - attr = n2->properties; - while (attr) { - if (attr->type == XML_ATTRIBUTE_NODE) { - prop1 = virXMLPropString(n1, (const char *) attr->name); - prop2 = virXMLPropString(n2, (const char *) attr->name); - if (STRNEQ_NULLABLE(prop1, prop2)) { - xmlFree(prop1); - xmlFree(prop2); - return false; - } - xmlFree(prop1); - xmlFree(prop2); - } - attr = attr->next; - } - - n1_child_size = virXMLChildElementCount(n1); - n2_child_size = virXMLChildElementCount(n2); - if (n1_child_size < 0 || n2_child_size < 0 || - n1_child_size < n2_child_size) - return false; - - if (n1_child_size == 0 && n2_child_size == 0) - return true; - - bitmap = virBitmapNew(n1_child_size); - - child2 = n2->children; - while (child2) { - if (child2->type != XML_ELEMENT_NODE) { - child2 = child2->next; - continue; - } - - child1 = n1->children; - n1_iter = 0; - found = false; - while (child1) { - if (child1->type != XML_ELEMENT_NODE) { - child1 = child1->next; - continue; - } - - if (virBitmapGetBit(bitmap, n1_iter, &visited) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (visited) { - child1 = child1->next; - n1_iter++; - continue; - } - - if (xmlStrEqual(child1->name, child2->name)) { - found = true; - if (virBitmapSetBit(bitmap, n1_iter) < 0) { - vshError(NULL, "%s", _("Bad child elements counting.")); - goto cleanup; - } - - if (!virshNodeIsSuperset(child1, child2)) - goto cleanup; - - break; - } - - child1 = child1->next; - n1_iter++; - } - - if (!found) - goto cleanup; - - child2 = child2->next; - } - - ret = true; - - cleanup: - virBitmapFree(bitmap); - return ret; -} - - /* * "detach-device" command */ -- 2.25.3

2 1

[PATCH libvirt v1 0/7] Support AP card, AP queues and AP matrix
by Shalini Chellathurai Saroja 04 Nov '20

04 Nov '20

Add support for AP card devices, AP queues and AP matrix devices in libvirt node device driver. Farhan Ali (3): nodedev: Detect AP Card device nodedev: Detect AP Queues virsh: nodedev: Filter by AP Card and AP Queue capabilities Shalini Chellathurai Saroja (4): nodedev: detect AP Matrix device virsh: nodedev: filter by AP Matrix capability node_device: refactor address retrieval of node device node_device: mdev matrix support docs/formatnode.html.in | 21 ++++ docs/manpages/virsh.rst | 2 +- docs/schemas/nodedev.rng | 66 ++++++++++- include/libvirt/libvirt-nodedev.h | 3 + src/conf/node_device_conf.c | 111 +++++++++++++++++- src/conf/node_device_conf.h | 30 ++++- src/conf/virnodedeviceobj.c | 8 +- src/libvirt-nodedev.c | 3 + src/node_device/node_device_driver.c | 32 ++++- src/node_device/node_device_udev.c | 80 +++++++++++++ tests/nodedevschemadata/ap_07_0038.xml | 9 ++ tests/nodedevschemadata/ap_card07.xml | 8 ++ tests/nodedevschemadata/ap_matrix.xml | 7 ++ ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 9 ++ tests/nodedevxml2xmltest.c | 4 + tools/virsh-nodedev.c | 9 ++ 16 files changed, 390 insertions(+), 12 deletions(-) create mode 100644 tests/nodedevschemadata/ap_07_0038.xml create mode 100644 tests/nodedevschemadata/ap_card07.xml create mode 100644 tests/nodedevschemadata/ap_matrix.xml create mode 100644 tests/nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml -- 2.26.2

3 13

[libvirt PATCH v4 0/4] Add support for QEMU's fmode and dmode
by Brian Turek 04 Nov '20

04 Nov '20

This is the latest set of patches to expose QEMU's fmode and dmode functionality. I hopefully split these up correctly per Peter Krempa's guidance. I debated where to implement the fmode/dmode value validation and ultimately decided on domain_conf.c rather than qemu_validate.c. My reasoning being that it is essentially enforcing the schema rather than performing QEMU-specific validation. Brian Turek (4): qemu: capabilities: add QEMU_CAPS_FSDEV_CREATEMODE qemu: add 'fmode' and 'dmode' options qemu: add support for 'fmode' and 'dmode' qemu: add docs for 'fmode' and 'dmode' options docs/formatdomain.rst | 13 ++++ docs/schemas/domaincommon.rng | 16 +++++ src/conf/domain_conf.c | 29 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++ src/qemu/qemu_validate.c | 18 ++++++ .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../virtio-9p-createmode.x86_64-latest.args | 46 ++++++++++++++ .../qemuxml2argvdata/virtio-9p-createmode.xml | 58 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../virtio-9p-createmode.x86_64-latest.xml | 61 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 47 files changed, 288 insertions(+) create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/virtio-9p-createmode.xml create mode 100644 tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml -- 2.25.1

2 8

[PATCH 0/3] IPV6 filters example.
by Aleksandr Alekseev 04 Nov '20

04 Nov '20

Add nwfilter examples for ipv6 similar to existing ip filters. Add appropriate docs for them and for some previously undocumented, but existing filters. Also fix a typo and some formatting. Aleksandr Alekseev (3): example: fix typo and formatting example: add ipv6 filters examples doc: document new filters and not documented ones docs/firewall.html.in | 9 ++++++ docs/formatnwfilter.html.in | 41 ++++++++++++++++++++++-- src/nwfilter/xml/allow-dhcp-server.xml | 4 +-- src/nwfilter/xml/allow-dhcp.xml | 4 +-- src/nwfilter/xml/allow-dhcpv6-server.xml | 27 ++++++++++++++++ src/nwfilter/xml/allow-dhcpv6.xml | 24 ++++++++++++++ src/nwfilter/xml/allow-incoming-ipv6.xml | 3 ++ src/nwfilter/xml/allow-ipv6.xml | 3 ++ src/nwfilter/xml/meson.build | 6 ++++ src/nwfilter/xml/no-ipv6-multicast.xml | 9 ++++++ src/nwfilter/xml/no-ipv6-spoofing.xml | 15 +++++++++ 11 files changed, 138 insertions(+), 7 deletions(-) create mode 100644 src/nwfilter/xml/allow-dhcpv6-server.xml create mode 100644 src/nwfilter/xml/allow-dhcpv6.xml create mode 100644 src/nwfilter/xml/allow-incoming-ipv6.xml create mode 100644 src/nwfilter/xml/allow-ipv6.xml create mode 100644 src/nwfilter/xml/no-ipv6-multicast.xml create mode 100644 src/nwfilter/xml/no-ipv6-spoofing.xml -- 2.28.0.97.gdc04167d37

2 4

[PATCH v2] cpu_ppc64: compare CPU function is ignoring return value
by Julio Faracco 04 Nov '20

04 Nov '20

Function to compare CPU on 64-bits PowerPC is ignoring the flag to avoid failure in case of CPUs (host and guest) are incompatible. Basically, the function is returning -1 even if it is set to continue. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/cpu/cpu_ppc64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 2fedcd25da..555eeecbe7 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -524,11 +524,11 @@ virCPUppc64Compare(virCPUDefPtr host, if (failIncompatible) { virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", _("unknown host CPU")); - } else { - VIR_WARN("unknown host CPU"); - ret = VIR_CPU_COMPARE_INCOMPATIBLE; + return VIR_CPU_COMPARE_ERROR; } - return -1; + + VIR_WARN("unknown host CPU"); + return VIR_CPU_COMPARE_INCOMPATIBLE; } ret = ppc64Compute(host, cpu, NULL, &message); -- 2.25.1

2 1

[PATCH 0/9] qemu: backup/checkpoint: Error reporting and handling fixes
by Peter Krempa 04 Nov '20

04 Nov '20

Peter Krempa (9): checkpoint: Mention that VIR_DOMAIN_CHECKPOINT_XML_SIZE may require running vm man: virsh: Mention that '--size' for 'checkpoint-dumpxml' may require running vm error: Introduce VIR_ERR_CHECKPOINT_INCONSISTENT error code qemu: backup: Use VIR_ERR_CHECKPOINT_INCONSISTENT when starting a backup checkpoint: Introduce VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE flag virsh: checkpoint-create: Add support for VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE conf: checkpoint: Split virDomainCheckpointRedefinePrep into two functions qemu: checkpoint: Implement VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE qemu: backup: Add partial validation of incremental backup checkpoint docs/manpages/virsh.rst | 13 ++++- include/libvirt/libvirt-domain-checkpoint.h | 2 + include/libvirt/virterror.h | 1 + src/conf/checkpoint_conf.c | 30 +++++++--- src/conf/checkpoint_conf.h | 14 +++-- src/libvirt-domain-checkpoint.c | 13 ++++- src/libvirt_private.syms | 1 + src/qemu/qemu_backup.c | 13 ++++- src/qemu/qemu_checkpoint.c | 64 +++++++++++++++------ src/test/test_driver.c | 9 ++- src/util/virerror.c | 4 ++ tools/virsh-checkpoint.c | 8 +++ 12 files changed, 133 insertions(+), 39 deletions(-) -- 2.26.2

2 18

[PATCH v2 0/9] tests: Add testing of qemu migration cookie
by Peter Krempa 04 Nov '20

04 Nov '20

Add testing of migration cookie as we don't have any schema or examples of it to prevent breakage and help with development. v2: - no longer depends on the somewhat controversial GHashTable refactor - removed leftover commented out code in patch 2 Peter Krempa (9): qemuxml2xmltest: Remove 'WITH_QEMU' conditional qemuxml2xmltest: Split out status XML testing to qemustatusxml2xmltest.c qemu_migration_cookie: Make header standalone qemu_migration_cookie: Export qemuMigrationCookieXMLFormat for tests tests: Add mock library for virGetHostname and virGetHostUUID qemu_migration_cookie: Make cookie parsing robust against missing domain job tests: Add testing of qemu migration cookie qemumigrationcookiexmltest: Add synthetic test case virCPUDefFormatBufFull: Use virXMLFormatElement src/conf/cpu_conf.c | 16 +- src/qemu/qemu_migration_cookie.c | 4 +- src/qemu/qemu_migration_cookie.h | 9 + src/util/virutil.h | 2 +- src/util/viruuid.h | 2 +- tests/hostidmock.c | 36 ++ tests/meson.build | 3 + .../basic-xml2xml-in.xml | 6 + .../basic-xml2xml-out.xml | 9 + .../full-xml2xml-in.xml | 221 ++++++++++++ .../full-xml2xml-out.xml | 219 ++++++++++++ .../modern-dom-out-dest.xml | 12 + .../modern-dom-out-source.xml | 12 + tests/qemumigrationcookiexmltest.c | 337 ++++++++++++++++++ tests/qemustatusxml2xmltest.c | 155 ++++++++ tests/qemuxml2xmltest.c | 136 ++----- 16 files changed, 1044 insertions(+), 135 deletions(-) create mode 100644 tests/hostidmock.c create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/basic-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-in.xml create mode 100644 tests/qemumigrationcookiexmldata/full-xml2xml-out.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-dest.xml create mode 100644 tests/qemumigrationcookiexmldata/modern-dom-out-source.xml create mode 100644 tests/qemumigrationcookiexmltest.c create mode 100644 tests/qemustatusxml2xmltest.c -- 2.26.2

2 18

[libvirt PATCH 0/2] quieten virSCSIHostGetUniqueId
by Ján Tomko 04 Nov '20

04 Nov '20

Suppress some possible errors if the device was unplugged during our probing. https://bugzilla.redhat.com/show_bug.cgi?id=1692100 Ján Tomko (2): util: use g_autofree in virSCSIHostGetUniqueId util: quieten virSCSIHostGetUniqueId src/util/virscsihost.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) -- 2.26.2

2 3

[PULL 0/6] Mips fixes patches
by Philippe Mathieu-Daudé 04 Nov '20

04 Nov '20

The following changes since commit 83851c7c60c90e9fb6a23ff48076387a77bc33cd: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-10-27-v3-ta= g' into staging (2020-11-03 12:47:58 +0000) are available in the Git repository at: https://gitlab.com/philmd/qemu.git tags/mips-fixes-20201103 for you to fetch changes up to 8a805609d126ff2be9ad9ec118185dfc52633d6f: target/mips: Add unaligned access support for MIPS64R6 and Loongson-3 (2020= -11-03 16:51:13 +0100) ---------------------------------------------------------------- MIPS patches queue - Removal of the 'r4k' machine (deprecated before 5.0) - Fix LGPL license text (Chetan Pant) - Support unaligned accesses on Loongson-3 (Huacai Chen) - Fix out-of-bound access in Loongson-3 embedded I/O interrupt controller (Alex Chen) CI jobs results: . https://cirrus-ci.com/build/6324890389184512 . https://gitlab.com/philmd/qemu/-/pipelines/211275262 . https://travis-ci.org/github/philmd/qemu/builds/741188958 ---------------------------------------------------------------- AlexChen (1): hw/intc/loongson: Fix incorrect 'core' calculation in liointc_read/write Chetan Pant (3): hw/mips: Fix Lesser GPL version number hw/mips/boston: Fix Lesser GPL version number target/mips: Fix Lesser GPL version number Huacai Chen (1): target/mips: Add unaligned access support for MIPS64R6 and Loongson-3 Philippe Mathieu-Daud=C3=A9 (1): hw/mips: Remove the 'r4k' machine docs/system/deprecated.rst | 12 +- .../devices/mips-softmmu-common.mak | 1 - include/hw/mips/cps.h | 2 +- include/hw/misc/mips_cpc.h | 2 +- include/hw/misc/mips_itu.h | 2 +- include/hw/pci-host/xilinx-pcie.h | 2 +- hw/core/loader-fit.c | 2 +- hw/intc/loongson_liointc.c | 4 +- hw/mips/boston.c | 2 +- hw/mips/cps.c | 2 +- hw/mips/r4k.c | 318 ------------------ hw/misc/mips_cpc.c | 2 +- hw/misc/mips_itu.c | 2 +- hw/pci-host/xilinx-pcie.c | 2 +- target/mips/cp0_helper.c | 2 +- target/mips/dsp_helper.c | 2 +- target/mips/fpu_helper.c | 2 +- target/mips/gdbstub.c | 2 +- target/mips/helper.c | 2 +- target/mips/lmmi_helper.c | 2 +- target/mips/mips-semi.c | 2 +- target/mips/msa_helper.c | 2 +- target/mips/op_helper.c | 2 +- target/mips/translate.c | 6 +- tests/qtest/cdrom-test.c | 2 +- tests/qtest/endianness-test.c | 2 - MAINTAINERS | 6 - hw/mips/Kconfig | 13 - hw/mips/meson.build | 1 - target/mips/translate_init.c.inc | 2 +- 30 files changed, 32 insertions(+), 373 deletions(-) delete mode 100644 hw/mips/r4k.c --=20 2.26.2

2 7

Hyper-V CPU details
by Matt Coleman 04 Nov '20

04 Nov '20

Hello, I'm implementing domainGetVcpus and could use some guidance on what value to use for virVcpuInfo->cpu. Hyper-V does not allow the user to pin vCPUs to host CPUs and doesn't allow the user to see which host CPU a vCPU is currently running on. Since it's a type 1 hypervisor, none of its scheduling data is available to the Windows userspace: there aren't any processes or threads that correspond to vCPUs that I could query the OS scheduler about. My code currently sets it to -1, which produces the following `virsh vcpuinfo` output for a running VM with two cores: VCPU: 0 CPU: -1 State: running CPU time: 1684.5s CPU Affinity: yyyy VCPU: 1 CPU: -1 State: running CPU time: 1346.0s CPU Affinity: yyyy However, this doesn't match the comment in _virVcpuInfo's declaration, which says that -1 signifies an offline CPU: https://gitlab.com/libvirt/libvirt/-/blob/v6.8.0/include/libvirt/libvirt-do… Should I stick with -1? Or, should I introduce -2 as a value that indicates that the hypervisor doesn't provide that information? Or, is there some better way to handle this that I'm not aware of? -- Matt

3 2

[PATCH v2 0/3] tests: Fix issues on macOS
by Roman Bolshakov 04 Nov '20

04 Nov '20

The series continues effort of fixing libvirt test suite on macOS [1] and combines previous patches sent a week ago [2][3]. The tests have been fixed: qemuhotplugtest qemumemlocktest qemuxml2xmltest storagepoolxml2argvtest Number of failing tests has been reduced to two: qemusecuritytest qemuxml2argvtest Changes since v1: - Separated virpcimock patch into two (Andrea) - Fixed incorrect test mock data after glusterfs arguments were reordered, instead of intruducing darwin-only test data (Andrea) 1. https://gitlab.com/libvirt/libvirt/-/issues/58 2. https://www.redhat.com/archives/libvir-list/2020-October/msg01345.html 3. https://www.redhat.com/archives/libvir-list/2020-October/msg01347.html Roman Bolshakov (3): virpcimock: Initialize real_close before using it virpcimock: Enable on macOS storagepoolxml2argvtest: Reorder gluster arguments tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 2 +- tests/virpcimock.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.28.0

2 4

[PATCH 0/4] Couple of qemusecuritytest and security_util improvements
by Michal Privoznik 04 Nov '20

04 Nov '20

These were sparked by a discussion on the list where the test is failing on macOS. Michal Prívozník (4): security_util: Don't error on macOS when getting/setting/moving XATTRs qemusecuritytest: Test SELinux too qemusecuritytest: Skip on non supported platforms qemu_conf: Don't even attempt to enable rememberOwner if unsupported src/libvirt_private.syms | 4 + src/qemu/qemu_conf.c | 7 +- src/security/security_util.c | 26 ++- src/security/security_util.h | 3 + tests/qemusecuritydata/virtual_domain_context | 2 + tests/qemusecuritydata/virtual_image_context | 2 + tests/qemusecuritymock.c | 195 +++++++++++++++++- tests/qemusecuritytest.c | 57 ++++- 8 files changed, 282 insertions(+), 14 deletions(-) create mode 100644 tests/qemusecuritydata/virtual_domain_context create mode 100644 tests/qemusecuritydata/virtual_image_context -- 2.26.2

3 10

[libvirt PATCH] rpm: more fixes for disabling features
by Daniel P. Berrangé 04 Nov '20

04 Nov '20

The %meson macro sets "--auto-features=enabled", so it is not enough to disable the driver options, we must also disable any library options which the drivers depend on. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 06afd0dab8..1b6a9596d8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1026,15 +1026,15 @@ exit 1 %endif %if %{with_esx} - %define arg_esx -Ddriver_esx=enabled + %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled %else - %define arg_esx -Ddriver_esx=disabled + %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled %endif %if %{with_hyperv} - %define arg_hyperv -Ddriver_hyperv=enabled + %define arg_hyperv -Ddriver_hyperv=enabled -Dopenwsman=enabled %else - %define arg_hyperv -Ddriver_hyperv=disabled + %define arg_hyperv -Ddriver_hyperv=disabled -Dopenwsman=disabled %endif %if %{with_vmware} @@ -1056,9 +1056,9 @@ exit 1 %endif %if %{with_storage_gluster} - %define arg_storage_gluster -Dstorage_gluster=enabled + %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled %else - %define arg_storage_gluster -Dstorage_gluster=disabled + %define arg_storage_gluster -Dstorage_gluster=disabled -Dglusterfs=disabled %endif %if %{with_storage_zfs} @@ -1104,9 +1104,9 @@ exit 1 %endif %if %{with_storage_iscsi_direct} - %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled -Dlibiscsi=enabled %else - %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled + %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled -Dlibiscsi=disabled %endif %if %{with_libssh} -- 2.28.0

2 3

[libvirt PATCH v2 0/3] Add script to sync from QEMU i386 cpu models
by Tim Wiederhake 03 Nov '20

03 Nov '20

This hopefully makes synchronization with QEMU faster and less error prone. Patch #3 showcases the changes to the cpu models the script suggests for qemu 8d90bfc5c31ad60f6049dd39be636b06bc00b652. V1: https://www.redhat.com/archives/libvir-list/2020-October/msg01008.html Changes since last version: * Use apostrophes instead of quotation marks in XML. Tim Wiederhake (3): cpu_map: Unify apostrophe and quotation mark usage cpu_map: Add script to sync from QEMU i386 cpu models [DONTMERGE] Sample output of new sync script src/cpu_map/arm_vendors.xml | 24 +- src/cpu_map/index.xml | 140 +++---- src/cpu_map/sync_qemu_i386.py | 361 ++++++++++++++++++ src/cpu_map/x86_486.xml | 8 + src/cpu_map/x86_Broadwell-IBRS.xml | 19 +- src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 19 +- src/cpu_map/x86_Broadwell-noTSX.xml | 19 +- src/cpu_map/x86_Broadwell.xml | 18 +- src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 20 +- src/cpu_map/x86_Cascadelake-Server.xml | 17 +- src/cpu_map/x86_Conroe.xml | 10 +- src/cpu_map/x86_Cooperlake.xml | 174 +++++---- src/cpu_map/x86_Denverton.xml | 74 ++++ src/cpu_map/x86_Dhyana.xml | 12 +- src/cpu_map/x86_EPYC-IBPB.xml | 19 +- src/cpu_map/x86_EPYC-Rome.xml | 9 + src/cpu_map/x86_EPYC.xml | 14 +- src/cpu_map/x86_Haswell-IBRS.xml | 20 +- src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 20 +- src/cpu_map/x86_Haswell-noTSX.xml | 20 +- src/cpu_map/x86_Haswell.xml | 18 +- src/cpu_map/x86_Icelake-Client-noTSX.xml | 14 +- src/cpu_map/x86_Icelake-Client.xml | 11 +- src/cpu_map/x86_Icelake-Server-noTSX.xml | 29 +- src/cpu_map/x86_Icelake-Server.xml | 11 +- src/cpu_map/x86_IvyBridge-IBRS.xml | 13 +- src/cpu_map/x86_IvyBridge.xml | 12 +- src/cpu_map/x86_KnightsMill.xml | 77 ++++ src/cpu_map/x86_Nehalem-IBRS.xml | 14 +- src/cpu_map/x86_Nehalem.xml | 13 +- src/cpu_map/x86_Opteron_G1.xml | 9 +- src/cpu_map/x86_Opteron_G2.xml | 10 +- src/cpu_map/x86_Opteron_G3.xml | 10 +- src/cpu_map/x86_Opteron_G4.xml | 11 +- src/cpu_map/x86_Opteron_G5.xml | 11 +- src/cpu_map/x86_Penryn.xml | 10 +- src/cpu_map/x86_SandyBridge-IBRS.xml | 14 +- src/cpu_map/x86_SandyBridge.xml | 13 +- src/cpu_map/x86_Skylake-Client-IBRS.xml | 16 +- src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 18 +- src/cpu_map/x86_Skylake-Client.xml | 15 +- src/cpu_map/x86_Skylake-Server-IBRS.xml | 12 +- src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 15 +- src/cpu_map/x86_Skylake-Server.xml | 12 +- src/cpu_map/x86_Snowridge.xml | 79 ++++ src/cpu_map/x86_Westmere-IBRS.xml | 13 +- src/cpu_map/x86_Westmere.xml | 14 +- src/cpu_map/x86_athlon.xml | 8 + src/cpu_map/x86_core2duo.xml | 12 +- src/cpu_map/x86_coreduo.xml | 10 +- src/cpu_map/x86_kvm32.xml | 9 + src/cpu_map/x86_kvm64.xml | 9 + src/cpu_map/x86_n270.xml | 12 +- src/cpu_map/x86_pentium.xml | 9 + src/cpu_map/x86_pentium2.xml | 9 + src/cpu_map/x86_pentium3.xml | 9 + src/cpu_map/x86_phenom.xml | 17 +- src/cpu_map/x86_qemu32.xml | 8 + src/cpu_map/x86_qemu64.xml | 17 +- 59 files changed, 1345 insertions(+), 295 deletions(-) create mode 100755 src/cpu_map/sync_qemu_i386.py create mode 100644 src/cpu_map/x86_Denverton.xml create mode 100644 src/cpu_map/x86_KnightsMill.xml create mode 100644 src/cpu_map/x86_Snowridge.xml -- 2.26.2

3 7

[PATCH] security: Use org namespace for xattrs on macOS
by Roman Bolshakov 03 Nov '20

03 Nov '20

There're no guidelines on what namespace should be used but it seems thirdparty apps can select the one they like [1], i.e. freedekstop xattrs are prefixed with xdg. qemusecuritytest passes after that. 1. https://www.freedesktop.org/wiki/CommonExtendedAttributes/ Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- src/security/security_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/security_util.c b/src/security/security_util.c index 7fa5163fe4..5d50acb574 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -56,6 +56,8 @@ VIR_LOG_INIT("security.security_util"); # define XATTR_NAMESPACE "trusted" #elif defined(__FreeBSD__) # define XATTR_NAMESPACE "system" +#elif defined(__APPLE__) +# define XATTR_NAMESPACE "org" #endif static char * -- 2.28.0

4 15

[PATCH-for-5.2 v3] hw/mips: Remove the 'r4k' machine
by Philippe Mathieu-Daudé 03 Nov '20

03 Nov '20

We deprecated the support for the 'r4k' machine for the 5.0 release (commit d32dc61421), which means that our deprecation policy allows us to drop it in release 5.2. Remove the code. To repeat the rationale from the deprecation note: - this virtual machine has no specification - the Linux kernel dropped support for it 10 years ago Users are recommended to use the Malta board instead. Acked-by: Richard Henderson <richard.henderson(a)linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- v3: Move to "Recently removed features" section --- docs/system/deprecated.rst | 12 +- .../devices/mips-softmmu-common.mak | 1 - hw/mips/r4k.c | 318 ------------------ MAINTAINERS | 6 - hw/mips/Kconfig | 13 - hw/mips/meson.build | 1 - 6 files changed, 6 insertions(+), 345 deletions(-) delete mode 100644 hw/mips/r4k.c diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a191..e5b7cf274d3 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -327,12 +327,6 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or System emulator machines ------------------------ -mips ``r4k`` platform (since 5.0) -''''''''''''''''''''''''''''''''' - -This machine type is very old and unmaintained. Users should use the ``malta`` -machine type instead. - mips ``fulong2e`` machine (since 5.1) ''''''''''''''''''''''''''''''''''''' @@ -575,6 +569,12 @@ The version specific Spike machines have been removed in favour of the generic ``spike`` machine. If you need to specify an older version of the RISC-V spec you can use the ``-cpu rv64gcsu,priv_spec=v1.10.0`` command line argument. +mips ``r4k`` platform (removed in 5.2) +'''''''''''''''''''''''''''''''''''''' + +This machine type is very old and unmaintained. Users should use the ``malta`` +machine type instead. + Related binaries ---------------- diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak index da29c6c0b24..ea78fe72759 100644 --- a/default-configs/devices/mips-softmmu-common.mak +++ b/default-configs/devices/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y -CONFIG_R4K=y CONFIG_MALTA=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y diff --git a/hw/mips/r4k.c b/hw/mips/r4k.c deleted file mode 100644 index 38308543421..00000000000 --- a/hw/mips/r4k.c +++ /dev/null @@ -1,318 +0,0 @@ -/* - * QEMU/MIPS pseudo-board - * - * emulates a simple machine with ISA-like bus. - * ISA IO space mapped to the 0x14000000 (PHYS) and - * ISA memory at the 0x10000000 (PHYS, 16Mb in size). - * All peripherial devices are attached to this "bus" with - * the standard PC ISA addresses. - */ - -#include "qemu/osdep.h" -#include "qemu/units.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "cpu.h" -#include "hw/clock.h" -#include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" -#include "hw/intc/i8259.h" -#include "hw/char/serial.h" -#include "hw/isa/isa.h" -#include "net/net.h" -#include "hw/net/ne2000-isa.h" -#include "sysemu/sysemu.h" -#include "hw/boards.h" -#include "hw/block/flash.h" -#include "qemu/log.h" -#include "hw/mips/bios.h" -#include "hw/ide.h" -#include "hw/ide/internal.h" -#include "hw/loader.h" -#include "elf.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/input/i8042.h" -#include "hw/timer/i8254.h" -#include "exec/address-spaces.h" -#include "sysemu/qtest.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "qemu/error-report.h" - -#define MAX_IDE_BUS 2 - -static const int ide_iobase[2] = { 0x1f0, 0x170 }; -static const int ide_iobase2[2] = { 0x3f6, 0x376 }; -static const int ide_irq[2] = { 14, 15 }; - -static ISADevice *pit; /* PIT i8254 */ - -/* i8254 PIT is attached to the IRQ0 at PIC i8259 */ - -static struct _loaderparams { - int ram_size; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; -} loaderparams; - -static void mips_qemu_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - if ((addr & 0xffff) == 0 && val == 42) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - } else if ((addr & 0xffff) == 4 && val == 42) { - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - } -} - -static uint64_t mips_qemu_read(void *opaque, hwaddr addr, - unsigned size) -{ - return 0; -} - -static const MemoryRegionOps mips_qemu_ops = { - .read = mips_qemu_read, - .write = mips_qemu_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - -typedef struct ResetData { - MIPSCPU *cpu; - uint64_t vector; -} ResetData; - -static int64_t load_kernel(void) -{ - const size_t params_size = 264; - int64_t entry, kernel_high, initrd_size; - long kernel_size; - ram_addr_t initrd_offset; - uint32_t *params_buf; - int big_endian; - -#ifdef TARGET_WORDS_BIGENDIAN - big_endian = 1; -#else - big_endian = 0; -#endif - kernel_size = load_elf(loaderparams.kernel_filename, NULL, - cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, - EM_MIPS, 1, 0); - if (kernel_size < 0) { - error_report("could not load kernel '%s': %s", - loaderparams.kernel_filename, - load_elf_strerror(kernel_size)); - exit(1); - } - - /* load initrd */ - initrd_size = 0; - initrd_offset = 0; - if (loaderparams.initrd_filename) { - initrd_size = get_image_size(loaderparams.initrd_filename); - if (initrd_size > 0) { - initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > ram_size) { - error_report("memory too small for initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - initrd_size = load_image_targphys(loaderparams.initrd_filename, - initrd_offset, - ram_size - initrd_offset); - } - if (initrd_size == (target_ulong) -1) { - error_report("could not load initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - } - - /* Store command line. */ - params_buf = g_malloc(params_size); - - params_buf[0] = tswap32(ram_size); - params_buf[1] = tswap32(0x12345678); - - if (initrd_size > 0) { - snprintf((char *)params_buf + 8, 256, - "rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s", - cpu_mips_phys_to_kseg0(NULL, initrd_offset), - initrd_size, loaderparams.kernel_cmdline); - } else { - snprintf((char *)params_buf + 8, 256, - "%s", loaderparams.kernel_cmdline); - } - - rom_add_blob_fixed("params", params_buf, params_size, - 16 * MiB - params_size); - - g_free(params_buf); - return entry; -} - -static void main_cpu_reset(void *opaque) -{ - ResetData *s = (ResetData *)opaque; - CPUMIPSState *env = &s->cpu->env; - - cpu_reset(CPU(s->cpu)); - env->active_tc.PC = s->vector; -} - -static const int sector_len = 32 * KiB; -static -void mips_r4k_init(MachineState *machine) -{ - const char *kernel_filename = machine->kernel_filename; - const char *kernel_cmdline = machine->kernel_cmdline; - const char *initrd_filename = machine->initrd_filename; - char *filename; - MemoryRegion *address_space_mem = get_system_memory(); - MemoryRegion *bios; - MemoryRegion *iomem = g_new(MemoryRegion, 1); - MemoryRegion *isa_io = g_new(MemoryRegion, 1); - MemoryRegion *isa_mem = g_new(MemoryRegion, 1); - int bios_size; - Clock *cpuclk; - MIPSCPU *cpu; - CPUMIPSState *env; - ResetData *reset_info; - int i; - qemu_irq *i8259; - ISABus *isa_bus; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - DriveInfo *dinfo; - int be; - - cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); - clock_set_hz(cpuclk, 200000000); /* 200 MHz */ - - /* init CPUs */ - cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk); - env = &cpu->env; - - reset_info = g_malloc0(sizeof(ResetData)); - reset_info->cpu = cpu; - reset_info->vector = env->active_tc.PC; - qemu_register_reset(main_cpu_reset, reset_info); - - /* allocate RAM */ - if (machine->ram_size > 256 * MiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 256MB", ram_size / MiB); - exit(1); - } - memory_region_add_subregion(address_space_mem, 0, machine->ram); - - memory_region_init_io(iomem, NULL, &mips_qemu_ops, - NULL, "mips-qemu", 0x10000); - - memory_region_add_subregion(address_space_mem, 0x1fbf0000, iomem); - - /* - * Try to load a BIOS image. If this fails, we continue regardless, - * but initialize the hardware ourselves. When a kernel gets - * preloaded we also initialize the hardware, since the BIOS wasn't - * run. - */ - - if (bios_name == NULL) { - bios_name = BIOS_FILENAME; - } - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (filename) { - bios_size = get_image_size(filename); - } else { - bios_size = -1; - } -#ifdef TARGET_WORDS_BIGENDIAN - be = 1; -#else - be = 0; -#endif - dinfo = drive_get(IF_PFLASH, 0, 0); - if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) { - bios = g_new(MemoryRegion, 1); - memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE, - &error_fatal); - memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios); - - load_image_targphys(filename, 0x1fc00000, BIOS_SIZE); - } else if (dinfo != NULL) { - uint32_t mips_rom = 0x00400000; - if (!pflash_cfi01_register(0x1fc00000, "mips_r4k.bios", mips_rom, - blk_by_legacy_dinfo(dinfo), - sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - } - } else if (!qtest_enabled()) { - /* not fatal */ - warn_report("could not load MIPS bios '%s'", bios_name); - } - g_free(filename); - - if (kernel_filename) { - loaderparams.ram_size = machine->ram_size; - loaderparams.kernel_filename = kernel_filename; - loaderparams.kernel_cmdline = kernel_cmdline; - loaderparams.initrd_filename = initrd_filename; - reset_info->vector = load_kernel(); - } - - /* Init CPU internal devices */ - cpu_mips_irq_init_cpu(cpu); - cpu_mips_clock_init(cpu); - - /* ISA bus: IO space at 0x14000000, mem space at 0x10000000 */ - memory_region_init_alias(isa_io, NULL, "isa-io", - get_system_io(), 0, 0x00010000); - memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); - memory_region_add_subregion(get_system_memory(), 0x14000000, isa_io); - memory_region_add_subregion(get_system_memory(), 0x10000000, isa_mem); - isa_bus = isa_bus_new(NULL, isa_mem, get_system_io(), &error_abort); - - /* The PIC is attached to the MIPS CPU INT0 pin */ - i8259 = i8259_init(isa_bus, env->irq[2]); - isa_bus_irqs(isa_bus, i8259); - - mc146818_rtc_init(isa_bus, 2000, NULL); - - pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - - serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS); - - isa_vga_init(isa_bus); - - if (nd_table[0].used) { - isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]); - } - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i = 0; i < MAX_IDE_BUS; i++) - isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], ide_irq[i], - hd[MAX_IDE_DEVS * i], - hd[MAX_IDE_DEVS * i + 1]); - - isa_create_simple(isa_bus, TYPE_I8042); -} - -static void mips_machine_init(MachineClass *mc) -{ - mc->deprecation_reason = "use malta machine type instead"; - mc->desc = "mips r4k platform"; - mc->init = mips_r4k_init; - mc->block_default_type = IF_IDE; -#ifdef TARGET_MIPS64 - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); -#else - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); -#endif - mc->default_ram_id = "mips_r4k.ram"; -} - -DEFINE_MACHINE("mips", mips_machine_init) diff --git a/MAINTAINERS b/MAINTAINERS index 8c744a9bdf4..77a67becc1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1138,12 +1138,6 @@ S: Orphaned F: hw/mips/mipssim.c F: hw/net/mipsnet.c -R4000 -R: Aurelien Jarno <aurelien(a)aurel32.net> -R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com> -S: Obsolete -F: hw/mips/r4k.c - Fuloong 2E M: Huacai Chen <chenhc(a)lemote.com> M: Philippe Mathieu-Daudé <f4bug(a)amsat.org> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 67d39c56a4e..8be70122f4c 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,16 +1,3 @@ -config R4K - bool - select ISA_BUS - select SERIAL_ISA - select I8259 - select I8254 - select MC146818RTC - imply VGA_ISA - imply NE2000_ISA - select IDE_ISA - select PCKBD - select PFLASH_CFI01 - config MALTA bool select ISA_SUPERIO diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 46294b7382f..bcdf96be69f 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -6,6 +6,5 @@ mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) -mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c')) hw_arch += {'mips': mips_ss} -- 2.26.2

3 4

Release of libvirt-6.9.0
by Jiri Denemark 03 Nov '20

03 Nov '20

The 6.9.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://libvirt.org/sources/ https://libvirt.org/sources/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing any other feedback. Your work is greatly appreciated. * New features * nodedev: Add support for channel subsystem (CSS) devices on S390 A CSS device is represented as a parent device of a CCW device. This support allows to create vfio-ccw mediated devices with ``virNodeDeviceCreateXML()``. * qemu: Implement memory failure event New event is implemented that is emitted whenever a guest encounters a memory failure. * qemu: Implement support for ``<transient/>`` disks VMs based on the QEMU hypervisor now can use ``<transient/>`` option for local file-backed disks to configure a disk which discards changes made to it while the VM was active. * hyperv: implement new APIs The ``virConnectGetCapabilities()``, ``virConnectGetMaxVcpus()``, ``virConnectGetVersion()``, ``virDomainGetAutostart()``, ``virDomainSetAutostart()``, ``virNodeGetFreeMemory()``, ``virDomainReboot()``, ``virDomainReset()``, ``virDomainShutdown()``, and ``virDomainShutdownFlags()`` APIs have been implemented in the Hyper-V driver. * bhyve: implement virtio-9p filesystem support Implement virito-9p shared filesystem using the ``<filesystem/>`` element. * qemu: Add support for vDPA network devices. VMs using the QEMU hypervisor can now specify vDPA network devices using ``<interface type='vdpa'>``. The node device APIs also now list and provide XML descriptions for vDPA devices. * Improvements * Bug fixes * hyperv: ensure WQL queries work in all locales Relying on the "Description" field caused queries to fail on non-"en-US" systems. The queries have been updated to avoid using localized strings. * rpc: Fix ``virt-ssh-helper`` detection libvirt 6.8.0 failed to correctly detect the availability of the new ``virt-ssh-helper`` command on the remote host, and thus always used the fallback instead; this has now been fixed. Enjoy. Jirka

2 5

[PATCH 0/8] more Hyper-V code cleanup
by Matt Coleman 03 Nov '20

03 Nov '20

Here's a draft GitLab MR if you'd prefer to review the changes there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/5 Matt Coleman (8): hyperv: g_autofree username and password in hypervConnectOpen() hyperv: remove spaces after hypervObject* casts hyperv: WMI class list function general cleanup hyperv: move hypervGetWmiClass to hyperv_wmi.h hyperv: move hypervGetProcSDByVSSDInstanceId to hyperv_wmi.c hyperv: consistent names for SettingData functions hyperv: minor formatting fix in hyperv_wmi.h hyperv: call openwsman's ws_serializer_free_mem src/hyperv/hyperv_driver.c | 87 ++++++++++---------------------------- src/hyperv/hyperv_wmi.c | 63 +++++++++++++++------------ src/hyperv/hyperv_wmi.h | 45 ++++++++++++++------ 3 files changed, 89 insertions(+), 106 deletions(-) -- 2.27.0

3 10

Call for Volunteers: Summaries of a few KVMForum-2020 talks for an LWN article
by Kashyap Chamarthy 03 Nov '20

03 Nov '20

Hi, folks Like last year[1], we're aiming to submit a KVM Forum 2020 "recap" article for LWN. This won't be a comprehensive summary of a lot of talks — LWN normally aims for 1500 words; they say "fewer can sometimes work, and more is generally OK too". Given that, the write-up can cover about four topics, similar to previous year's recap. So I'm looking for a couple of volunteers. Meanwhile, I'll write LWN folks an email to see if they're amenable to this. If they can't accept it for some reason, Plan-B is qemu.org blog articles. - KVM Forum 2020 schedule: https://kvmforum2020.sched.com/ - And LWN.net's author guidelines: https://lwn.net/op/AuthorGuide.lwn I volunteer to summarize Janosch Frank's "The Common Challenges of Secure VMs" talk. Let me know, on-list or off-list, on what topic you'd like to pick. PS: Just like it was noted in the last year's call for volunteers, we will not ask LWN.net for money. [1] https://lwn.net/Articles/805097/ -- A recap of KVM Forum 2019 [2] https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg03536.html -- /kashyap

1 1

[PATCH-for-5.2] hw/mips: Remove the 'r4k' machine
by Philippe Mathieu-Daudé 03 Nov '20

03 Nov '20

We deprecated the support for the 'r4k' machine for the 5.0 release (commit d32dc61421), which means that our deprecation policy allows us to drop it in release 5.2. Remove the code. To repeat the rationale from the deprecation note: - this virtual machine has no specification - the Linux kernel dropped support for it 10 years ago Users are recommended to use the Malta board instead. Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- docs/system/deprecated.rst | 2 +- .../devices/mips-softmmu-common.mak | 1 - hw/mips/r4k.c | 318 ------------------ MAINTAINERS | 6 - hw/mips/Kconfig | 13 - hw/mips/meson.build | 1 - 6 files changed, 1 insertion(+), 340 deletions(-) delete mode 100644 hw/mips/r4k.c diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a191..0e83ea2ca0a 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -327,7 +327,7 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or System emulator machines ------------------------ -mips ``r4k`` platform (since 5.0) +mips ``r4k`` platform (removed in 5.2) ''''''''''''''''''''''''''''''''' This machine type is very old and unmaintained. Users should use the ``malta`` diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak index da29c6c0b24..ea78fe72759 100644 --- a/default-configs/devices/mips-softmmu-common.mak +++ b/default-configs/devices/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y -CONFIG_R4K=y CONFIG_MALTA=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y diff --git a/hw/mips/r4k.c b/hw/mips/r4k.c deleted file mode 100644 index 38308543421..00000000000 --- a/hw/mips/r4k.c +++ /dev/null @@ -1,318 +0,0 @@ -/* - * QEMU/MIPS pseudo-board - * - * emulates a simple machine with ISA-like bus. - * ISA IO space mapped to the 0x14000000 (PHYS) and - * ISA memory at the 0x10000000 (PHYS, 16Mb in size). - * All peripherial devices are attached to this "bus" with - * the standard PC ISA addresses. - */ - -#include "qemu/osdep.h" -#include "qemu/units.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "cpu.h" -#include "hw/clock.h" -#include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" -#include "hw/intc/i8259.h" -#include "hw/char/serial.h" -#include "hw/isa/isa.h" -#include "net/net.h" -#include "hw/net/ne2000-isa.h" -#include "sysemu/sysemu.h" -#include "hw/boards.h" -#include "hw/block/flash.h" -#include "qemu/log.h" -#include "hw/mips/bios.h" -#include "hw/ide.h" -#include "hw/ide/internal.h" -#include "hw/loader.h" -#include "elf.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/input/i8042.h" -#include "hw/timer/i8254.h" -#include "exec/address-spaces.h" -#include "sysemu/qtest.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "qemu/error-report.h" - -#define MAX_IDE_BUS 2 - -static const int ide_iobase[2] = { 0x1f0, 0x170 }; -static const int ide_iobase2[2] = { 0x3f6, 0x376 }; -static const int ide_irq[2] = { 14, 15 }; - -static ISADevice *pit; /* PIT i8254 */ - -/* i8254 PIT is attached to the IRQ0 at PIC i8259 */ - -static struct _loaderparams { - int ram_size; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; -} loaderparams; - -static void mips_qemu_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - if ((addr & 0xffff) == 0 && val == 42) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - } else if ((addr & 0xffff) == 4 && val == 42) { - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - } -} - -static uint64_t mips_qemu_read(void *opaque, hwaddr addr, - unsigned size) -{ - return 0; -} - -static const MemoryRegionOps mips_qemu_ops = { - .read = mips_qemu_read, - .write = mips_qemu_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - -typedef struct ResetData { - MIPSCPU *cpu; - uint64_t vector; -} ResetData; - -static int64_t load_kernel(void) -{ - const size_t params_size = 264; - int64_t entry, kernel_high, initrd_size; - long kernel_size; - ram_addr_t initrd_offset; - uint32_t *params_buf; - int big_endian; - -#ifdef TARGET_WORDS_BIGENDIAN - big_endian = 1; -#else - big_endian = 0; -#endif - kernel_size = load_elf(loaderparams.kernel_filename, NULL, - cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, - EM_MIPS, 1, 0); - if (kernel_size < 0) { - error_report("could not load kernel '%s': %s", - loaderparams.kernel_filename, - load_elf_strerror(kernel_size)); - exit(1); - } - - /* load initrd */ - initrd_size = 0; - initrd_offset = 0; - if (loaderparams.initrd_filename) { - initrd_size = get_image_size(loaderparams.initrd_filename); - if (initrd_size > 0) { - initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > ram_size) { - error_report("memory too small for initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - initrd_size = load_image_targphys(loaderparams.initrd_filename, - initrd_offset, - ram_size - initrd_offset); - } - if (initrd_size == (target_ulong) -1) { - error_report("could not load initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - } - - /* Store command line. */ - params_buf = g_malloc(params_size); - - params_buf[0] = tswap32(ram_size); - params_buf[1] = tswap32(0x12345678); - - if (initrd_size > 0) { - snprintf((char *)params_buf + 8, 256, - "rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s", - cpu_mips_phys_to_kseg0(NULL, initrd_offset), - initrd_size, loaderparams.kernel_cmdline); - } else { - snprintf((char *)params_buf + 8, 256, - "%s", loaderparams.kernel_cmdline); - } - - rom_add_blob_fixed("params", params_buf, params_size, - 16 * MiB - params_size); - - g_free(params_buf); - return entry; -} - -static void main_cpu_reset(void *opaque) -{ - ResetData *s = (ResetData *)opaque; - CPUMIPSState *env = &s->cpu->env; - - cpu_reset(CPU(s->cpu)); - env->active_tc.PC = s->vector; -} - -static const int sector_len = 32 * KiB; -static -void mips_r4k_init(MachineState *machine) -{ - const char *kernel_filename = machine->kernel_filename; - const char *kernel_cmdline = machine->kernel_cmdline; - const char *initrd_filename = machine->initrd_filename; - char *filename; - MemoryRegion *address_space_mem = get_system_memory(); - MemoryRegion *bios; - MemoryRegion *iomem = g_new(MemoryRegion, 1); - MemoryRegion *isa_io = g_new(MemoryRegion, 1); - MemoryRegion *isa_mem = g_new(MemoryRegion, 1); - int bios_size; - Clock *cpuclk; - MIPSCPU *cpu; - CPUMIPSState *env; - ResetData *reset_info; - int i; - qemu_irq *i8259; - ISABus *isa_bus; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - DriveInfo *dinfo; - int be; - - cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); - clock_set_hz(cpuclk, 200000000); /* 200 MHz */ - - /* init CPUs */ - cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk); - env = &cpu->env; - - reset_info = g_malloc0(sizeof(ResetData)); - reset_info->cpu = cpu; - reset_info->vector = env->active_tc.PC; - qemu_register_reset(main_cpu_reset, reset_info); - - /* allocate RAM */ - if (machine->ram_size > 256 * MiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 256MB", ram_size / MiB); - exit(1); - } - memory_region_add_subregion(address_space_mem, 0, machine->ram); - - memory_region_init_io(iomem, NULL, &mips_qemu_ops, - NULL, "mips-qemu", 0x10000); - - memory_region_add_subregion(address_space_mem, 0x1fbf0000, iomem); - - /* - * Try to load a BIOS image. If this fails, we continue regardless, - * but initialize the hardware ourselves. When a kernel gets - * preloaded we also initialize the hardware, since the BIOS wasn't - * run. - */ - - if (bios_name == NULL) { - bios_name = BIOS_FILENAME; - } - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (filename) { - bios_size = get_image_size(filename); - } else { - bios_size = -1; - } -#ifdef TARGET_WORDS_BIGENDIAN - be = 1; -#else - be = 0; -#endif - dinfo = drive_get(IF_PFLASH, 0, 0); - if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) { - bios = g_new(MemoryRegion, 1); - memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE, - &error_fatal); - memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios); - - load_image_targphys(filename, 0x1fc00000, BIOS_SIZE); - } else if (dinfo != NULL) { - uint32_t mips_rom = 0x00400000; - if (!pflash_cfi01_register(0x1fc00000, "mips_r4k.bios", mips_rom, - blk_by_legacy_dinfo(dinfo), - sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - } - } else if (!qtest_enabled()) { - /* not fatal */ - warn_report("could not load MIPS bios '%s'", bios_name); - } - g_free(filename); - - if (kernel_filename) { - loaderparams.ram_size = machine->ram_size; - loaderparams.kernel_filename = kernel_filename; - loaderparams.kernel_cmdline = kernel_cmdline; - loaderparams.initrd_filename = initrd_filename; - reset_info->vector = load_kernel(); - } - - /* Init CPU internal devices */ - cpu_mips_irq_init_cpu(cpu); - cpu_mips_clock_init(cpu); - - /* ISA bus: IO space at 0x14000000, mem space at 0x10000000 */ - memory_region_init_alias(isa_io, NULL, "isa-io", - get_system_io(), 0, 0x00010000); - memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); - memory_region_add_subregion(get_system_memory(), 0x14000000, isa_io); - memory_region_add_subregion(get_system_memory(), 0x10000000, isa_mem); - isa_bus = isa_bus_new(NULL, isa_mem, get_system_io(), &error_abort); - - /* The PIC is attached to the MIPS CPU INT0 pin */ - i8259 = i8259_init(isa_bus, env->irq[2]); - isa_bus_irqs(isa_bus, i8259); - - mc146818_rtc_init(isa_bus, 2000, NULL); - - pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - - serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS); - - isa_vga_init(isa_bus); - - if (nd_table[0].used) { - isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]); - } - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i = 0; i < MAX_IDE_BUS; i++) - isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], ide_irq[i], - hd[MAX_IDE_DEVS * i], - hd[MAX_IDE_DEVS * i + 1]); - - isa_create_simple(isa_bus, TYPE_I8042); -} - -static void mips_machine_init(MachineClass *mc) -{ - mc->deprecation_reason = "use malta machine type instead"; - mc->desc = "mips r4k platform"; - mc->init = mips_r4k_init; - mc->block_default_type = IF_IDE; -#ifdef TARGET_MIPS64 - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); -#else - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); -#endif - mc->default_ram_id = "mips_r4k.ram"; -} - -DEFINE_MACHINE("mips", mips_machine_init) diff --git a/MAINTAINERS b/MAINTAINERS index 8c744a9bdf4..77a67becc1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1138,12 +1138,6 @@ S: Orphaned F: hw/mips/mipssim.c F: hw/net/mipsnet.c -R4000 -R: Aurelien Jarno <aurelien(a)aurel32.net> -R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com> -S: Obsolete -F: hw/mips/r4k.c - Fuloong 2E M: Huacai Chen <chenhc(a)lemote.com> M: Philippe Mathieu-Daudé <f4bug(a)amsat.org> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 67d39c56a4e..8be70122f4c 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,16 +1,3 @@ -config R4K - bool - select ISA_BUS - select SERIAL_ISA - select I8259 - select I8254 - select MC146818RTC - imply VGA_ISA - imply NE2000_ISA - select IDE_ISA - select PCKBD - select PFLASH_CFI01 - config MALTA bool select ISA_SUPERIO diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 46294b7382f..bcdf96be69f 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -6,6 +6,5 @@ mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) -mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c')) hw_arch += {'mips': mips_ss} -- 2.26.2

3 3

[PATCH-for-5.2 v2] hw/mips: Remove the 'r4k' machine
by Philippe Mathieu-Daudé 02 Nov '20

02 Nov '20

We deprecated the support for the 'r4k' machine for the 5.0 release (commit d32dc61421), which means that our deprecation policy allows us to drop it in release 5.2. Remove the code. To repeat the rationale from the deprecation note: - this virtual machine has no specification - the Linux kernel dropped support for it 10 years ago Users are recommended to use the Malta board instead. Acked-by: Richard Henderson <richard.henderson(a)linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- v2: Fixed Header underline length (Richard) --- docs/system/deprecated.rst | 4 +- .../devices/mips-softmmu-common.mak | 1 - hw/mips/r4k.c | 318 ------------------ MAINTAINERS | 6 - hw/mips/Kconfig | 13 - hw/mips/meson.build | 1 - 6 files changed, 2 insertions(+), 341 deletions(-) delete mode 100644 hw/mips/r4k.c diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a191..2a16078a09b 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -327,8 +327,8 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or System emulator machines ------------------------ -mips ``r4k`` platform (since 5.0) -''''''''''''''''''''''''''''''''' +mips ``r4k`` platform (removed in 5.2) +'''''''''''''''''''''''''''''''''''''' This machine type is very old and unmaintained. Users should use the ``malta`` machine type instead. diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak index da29c6c0b24..ea78fe72759 100644 --- a/default-configs/devices/mips-softmmu-common.mak +++ b/default-configs/devices/mips-softmmu-common.mak @@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y -CONFIG_R4K=y CONFIG_MALTA=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y diff --git a/hw/mips/r4k.c b/hw/mips/r4k.c deleted file mode 100644 index 38308543421..00000000000 --- a/hw/mips/r4k.c +++ /dev/null @@ -1,318 +0,0 @@ -/* - * QEMU/MIPS pseudo-board - * - * emulates a simple machine with ISA-like bus. - * ISA IO space mapped to the 0x14000000 (PHYS) and - * ISA memory at the 0x10000000 (PHYS, 16Mb in size). - * All peripherial devices are attached to this "bus" with - * the standard PC ISA addresses. - */ - -#include "qemu/osdep.h" -#include "qemu/units.h" -#include "qapi/error.h" -#include "qemu-common.h" -#include "cpu.h" -#include "hw/clock.h" -#include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" -#include "hw/intc/i8259.h" -#include "hw/char/serial.h" -#include "hw/isa/isa.h" -#include "net/net.h" -#include "hw/net/ne2000-isa.h" -#include "sysemu/sysemu.h" -#include "hw/boards.h" -#include "hw/block/flash.h" -#include "qemu/log.h" -#include "hw/mips/bios.h" -#include "hw/ide.h" -#include "hw/ide/internal.h" -#include "hw/loader.h" -#include "elf.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/input/i8042.h" -#include "hw/timer/i8254.h" -#include "exec/address-spaces.h" -#include "sysemu/qtest.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "qemu/error-report.h" - -#define MAX_IDE_BUS 2 - -static const int ide_iobase[2] = { 0x1f0, 0x170 }; -static const int ide_iobase2[2] = { 0x3f6, 0x376 }; -static const int ide_irq[2] = { 14, 15 }; - -static ISADevice *pit; /* PIT i8254 */ - -/* i8254 PIT is attached to the IRQ0 at PIC i8259 */ - -static struct _loaderparams { - int ram_size; - const char *kernel_filename; - const char *kernel_cmdline; - const char *initrd_filename; -} loaderparams; - -static void mips_qemu_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - if ((addr & 0xffff) == 0 && val == 42) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - } else if ((addr & 0xffff) == 4 && val == 42) { - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - } -} - -static uint64_t mips_qemu_read(void *opaque, hwaddr addr, - unsigned size) -{ - return 0; -} - -static const MemoryRegionOps mips_qemu_ops = { - .read = mips_qemu_read, - .write = mips_qemu_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - -typedef struct ResetData { - MIPSCPU *cpu; - uint64_t vector; -} ResetData; - -static int64_t load_kernel(void) -{ - const size_t params_size = 264; - int64_t entry, kernel_high, initrd_size; - long kernel_size; - ram_addr_t initrd_offset; - uint32_t *params_buf; - int big_endian; - -#ifdef TARGET_WORDS_BIGENDIAN - big_endian = 1; -#else - big_endian = 0; -#endif - kernel_size = load_elf(loaderparams.kernel_filename, NULL, - cpu_mips_kseg0_to_phys, NULL, - (uint64_t *)&entry, NULL, - (uint64_t *)&kernel_high, NULL, big_endian, - EM_MIPS, 1, 0); - if (kernel_size < 0) { - error_report("could not load kernel '%s': %s", - loaderparams.kernel_filename, - load_elf_strerror(kernel_size)); - exit(1); - } - - /* load initrd */ - initrd_size = 0; - initrd_offset = 0; - if (loaderparams.initrd_filename) { - initrd_size = get_image_size(loaderparams.initrd_filename); - if (initrd_size > 0) { - initrd_offset = ROUND_UP(kernel_high, INITRD_PAGE_SIZE); - if (initrd_offset + initrd_size > ram_size) { - error_report("memory too small for initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - initrd_size = load_image_targphys(loaderparams.initrd_filename, - initrd_offset, - ram_size - initrd_offset); - } - if (initrd_size == (target_ulong) -1) { - error_report("could not load initial ram disk '%s'", - loaderparams.initrd_filename); - exit(1); - } - } - - /* Store command line. */ - params_buf = g_malloc(params_size); - - params_buf[0] = tswap32(ram_size); - params_buf[1] = tswap32(0x12345678); - - if (initrd_size > 0) { - snprintf((char *)params_buf + 8, 256, - "rd_start=0x%" PRIx64 " rd_size=%" PRId64 " %s", - cpu_mips_phys_to_kseg0(NULL, initrd_offset), - initrd_size, loaderparams.kernel_cmdline); - } else { - snprintf((char *)params_buf + 8, 256, - "%s", loaderparams.kernel_cmdline); - } - - rom_add_blob_fixed("params", params_buf, params_size, - 16 * MiB - params_size); - - g_free(params_buf); - return entry; -} - -static void main_cpu_reset(void *opaque) -{ - ResetData *s = (ResetData *)opaque; - CPUMIPSState *env = &s->cpu->env; - - cpu_reset(CPU(s->cpu)); - env->active_tc.PC = s->vector; -} - -static const int sector_len = 32 * KiB; -static -void mips_r4k_init(MachineState *machine) -{ - const char *kernel_filename = machine->kernel_filename; - const char *kernel_cmdline = machine->kernel_cmdline; - const char *initrd_filename = machine->initrd_filename; - char *filename; - MemoryRegion *address_space_mem = get_system_memory(); - MemoryRegion *bios; - MemoryRegion *iomem = g_new(MemoryRegion, 1); - MemoryRegion *isa_io = g_new(MemoryRegion, 1); - MemoryRegion *isa_mem = g_new(MemoryRegion, 1); - int bios_size; - Clock *cpuclk; - MIPSCPU *cpu; - CPUMIPSState *env; - ResetData *reset_info; - int i; - qemu_irq *i8259; - ISABus *isa_bus; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; - DriveInfo *dinfo; - int be; - - cpuclk = clock_new(OBJECT(machine), "cpu-refclk"); - clock_set_hz(cpuclk, 200000000); /* 200 MHz */ - - /* init CPUs */ - cpu = mips_cpu_create_with_clock(machine->cpu_type, cpuclk); - env = &cpu->env; - - reset_info = g_malloc0(sizeof(ResetData)); - reset_info->cpu = cpu; - reset_info->vector = env->active_tc.PC; - qemu_register_reset(main_cpu_reset, reset_info); - - /* allocate RAM */ - if (machine->ram_size > 256 * MiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 256MB", ram_size / MiB); - exit(1); - } - memory_region_add_subregion(address_space_mem, 0, machine->ram); - - memory_region_init_io(iomem, NULL, &mips_qemu_ops, - NULL, "mips-qemu", 0x10000); - - memory_region_add_subregion(address_space_mem, 0x1fbf0000, iomem); - - /* - * Try to load a BIOS image. If this fails, we continue regardless, - * but initialize the hardware ourselves. When a kernel gets - * preloaded we also initialize the hardware, since the BIOS wasn't - * run. - */ - - if (bios_name == NULL) { - bios_name = BIOS_FILENAME; - } - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - if (filename) { - bios_size = get_image_size(filename); - } else { - bios_size = -1; - } -#ifdef TARGET_WORDS_BIGENDIAN - be = 1; -#else - be = 0; -#endif - dinfo = drive_get(IF_PFLASH, 0, 0); - if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) { - bios = g_new(MemoryRegion, 1); - memory_region_init_rom(bios, NULL, "mips_r4k.bios", BIOS_SIZE, - &error_fatal); - memory_region_add_subregion(get_system_memory(), 0x1fc00000, bios); - - load_image_targphys(filename, 0x1fc00000, BIOS_SIZE); - } else if (dinfo != NULL) { - uint32_t mips_rom = 0x00400000; - if (!pflash_cfi01_register(0x1fc00000, "mips_r4k.bios", mips_rom, - blk_by_legacy_dinfo(dinfo), - sector_len, 4, 0, 0, 0, 0, be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - } - } else if (!qtest_enabled()) { - /* not fatal */ - warn_report("could not load MIPS bios '%s'", bios_name); - } - g_free(filename); - - if (kernel_filename) { - loaderparams.ram_size = machine->ram_size; - loaderparams.kernel_filename = kernel_filename; - loaderparams.kernel_cmdline = kernel_cmdline; - loaderparams.initrd_filename = initrd_filename; - reset_info->vector = load_kernel(); - } - - /* Init CPU internal devices */ - cpu_mips_irq_init_cpu(cpu); - cpu_mips_clock_init(cpu); - - /* ISA bus: IO space at 0x14000000, mem space at 0x10000000 */ - memory_region_init_alias(isa_io, NULL, "isa-io", - get_system_io(), 0, 0x00010000); - memory_region_init(isa_mem, NULL, "isa-mem", 0x01000000); - memory_region_add_subregion(get_system_memory(), 0x14000000, isa_io); - memory_region_add_subregion(get_system_memory(), 0x10000000, isa_mem); - isa_bus = isa_bus_new(NULL, isa_mem, get_system_io(), &error_abort); - - /* The PIC is attached to the MIPS CPU INT0 pin */ - i8259 = i8259_init(isa_bus, env->irq[2]); - isa_bus_irqs(isa_bus, i8259); - - mc146818_rtc_init(isa_bus, 2000, NULL); - - pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); - - serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS); - - isa_vga_init(isa_bus); - - if (nd_table[0].used) { - isa_ne2000_init(isa_bus, 0x300, 9, &nd_table[0]); - } - - ide_drive_get(hd, ARRAY_SIZE(hd)); - for (i = 0; i < MAX_IDE_BUS; i++) - isa_ide_init(isa_bus, ide_iobase[i], ide_iobase2[i], ide_irq[i], - hd[MAX_IDE_DEVS * i], - hd[MAX_IDE_DEVS * i + 1]); - - isa_create_simple(isa_bus, TYPE_I8042); -} - -static void mips_machine_init(MachineClass *mc) -{ - mc->deprecation_reason = "use malta machine type instead"; - mc->desc = "mips r4k platform"; - mc->init = mips_r4k_init; - mc->block_default_type = IF_IDE; -#ifdef TARGET_MIPS64 - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("R4000"); -#else - mc->default_cpu_type = MIPS_CPU_TYPE_NAME("24Kf"); -#endif - mc->default_ram_id = "mips_r4k.ram"; -} - -DEFINE_MACHINE("mips", mips_machine_init) diff --git a/MAINTAINERS b/MAINTAINERS index 8c744a9bdf4..77a67becc1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1138,12 +1138,6 @@ S: Orphaned F: hw/mips/mipssim.c F: hw/net/mipsnet.c -R4000 -R: Aurelien Jarno <aurelien(a)aurel32.net> -R: Aleksandar Rikalo <aleksandar.rikalo(a)syrmia.com> -S: Obsolete -F: hw/mips/r4k.c - Fuloong 2E M: Huacai Chen <chenhc(a)lemote.com> M: Philippe Mathieu-Daudé <f4bug(a)amsat.org> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 67d39c56a4e..8be70122f4c 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,16 +1,3 @@ -config R4K - bool - select ISA_BUS - select SERIAL_ISA - select I8259 - select I8254 - select MC146818RTC - imply VGA_ISA - imply NE2000_ISA - select IDE_ISA - select PCKBD - select PFLASH_CFI01 - config MALTA bool select ISA_SUPERIO diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 46294b7382f..bcdf96be69f 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -6,6 +6,5 @@ mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_MIPS_BOSTON', if_true: [files('boston.c'), fdt]) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) -mips_ss.add(when: 'CONFIG_R4K', if_true: files('r4k.c')) hw_arch += {'mips': mips_ss} -- 2.26.2

1 1

[PATCH] virDomainNetDefParseXML: Fix error message for unknown value of //mac/@type
by Michal Privoznik 02 Nov '20

02 Nov '20

In v6.6.0-rc1~124 we've introduced a new mechanism for MAC addresses for ESX: ignore all checks (type='static') that libvirt or ESX would do (and possibly fail) for specified MAC address. Accepted values for the @type attribute are "generated" and "static". But the error message mentions a different attribute. Fixes 454e5961abf40c14f8b6d7ee216229e68fd170bf Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1892130 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f4f017cf83..b47f43afd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12248,7 +12248,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int tmp; if ((tmp = virDomainNetMacTypeTypeFromString(macaddr_type)) <= 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid mac address check value: '%s'. Valid " + _("invalid mac address type value: '%s'. Valid " "values are \"generated\" and \"static\"."), macaddr_type); goto error; -- 2.26.2

1 0

[PATCH 0/6] Hyper-V code cleanup
by Matt Coleman 02 Nov '20

02 Nov '20

Here's a draft GitLab MR if you'd prefer to review the changes there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/3/diffs Matt Coleman (6): hyperv: reformat WQL query strings hyperv: remove duplicate function hypervGetVSSDFromUUID() hyperv: remove duplicate function hypervGetMemSDByVSSDInstanceId() hyperv: remove unneeded braces in hypervDomainGetInfo() and hypervDomainGetXMLDesc() hyperv: reduce duplicate code for Msvm_ComputerSystem lookups hyperv: do not overwrite errors from hypervInvokeMethod() src/hyperv/hyperv_driver.c | 169 +++++++++---------------------------- src/hyperv/hyperv_wmi.c | 57 +++++++------ src/hyperv/hyperv_wmi.h | 4 + 3 files changed, 75 insertions(+), 155 deletions(-) -- 2.27.0

3 9

[PATCH 0/3] qemu: Prevent breakage of libvirt-6.9.0 with qemu-5.2.0
by Peter Krempa 02 Nov '20

02 Nov '20

Justification from 1/3: Unfortunately qemu wants to change the interface of 'block-export-add' before the release. Since we've tried to stay up to date and added the code before it was written in stone, we need to disable the use of the new interface for the upcoming libvirt release so that we don't have a version of libvirt which would not work with the upcoming qemu version. Patch 2/3 is the fix itself which uses the new interface. Patch 1/3 and 3/3 are a plan-B option if qemu doesn't include the fix until libvirt-6.9.0 will be about to be released. In such case I'll push patch 1/3 and patches 2-3/3 will be left for a subsequent release. Peter Krempa (3): qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD qemu: Update to new design of 'block-export-add' qemu: capabilities: Re-enable detection of QEMU_CAPS_BLOCK_EXPORT_ADD src/qemu/qemu_block.c | 17 +- src/qemu/qemu_block.h | 2 +- .../caps_5.2.0.x86_64.replies | 2377 +++++++++-------- .../caps_5.2.0.x86_64.xml | 2 +- tests/qemumonitorjsontest.c | 3 +- 5 files changed, 1339 insertions(+), 1062 deletions(-) -- 2.26.2

2 10

[libvirt PATCH] rpm: fix name of meson option for disabling glusterfs
by Daniel P. Berrangé 02 Nov '20

02 Nov '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 06afd0dab8..f0990b870b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1056,9 +1056,9 @@ exit 1 %endif %if %{with_storage_gluster} - %define arg_storage_gluster -Dstorage_gluster=enabled + %define arg_storage_gluster -Dstorage_glusterfs=enabled %else - %define arg_storage_gluster -Dstorage_gluster=disabled + %define arg_storage_gluster -Dstorage_glusterfs=disabled %endif %if %{with_storage_zfs} -- 2.28.0

1 1

[PATCH] news: Fix an RST alignment typo with '=' which breaks the pipeline
by Erik Skultety 02 Nov '20

02 Nov '20

This is just a warning, but because we're invoking rst2html5 with --strict, it will fail at encountering a single minor issue. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index 09170638ec..a8dde151e0 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -9,7 +9,7 @@ For a more fine-grained view, use the `git log`_. v6.10.0 (unreleased) -=================== +==================== * **New features** -- 2.26.2

2 2

[libvirt PATCH] news: Remove empty section
by Andrea Bolognani 02 Nov '20

02 Nov '20

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. NEWS.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/NEWS.rst b/NEWS.rst index a8dde151e0..905deba5a8 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -59,8 +59,6 @@ v6.9.0 (2020-11-02) using ``<interface type='vdpa'>``. The node device APIs also now list and provide XML descriptions for vDPA devices. -* **Improvements** - * **Bug fixes** * hyperv: ensure WQL queries work in all locales -- 2.26.2

1 0

Proposal: drop support for Hyper-V 2008R2
by Matt Coleman 02 Nov '20

02 Nov '20

Hello, I've been getting familiar with Hyper-V recently and have gotten stymied by inconsistencies in its API. While Hyper-V has V1 and V2 APIs, neither one is consistent between Windows versions. For example... * Windows 2012 only supports a subset of the V2 API * Windows 2012 implements some V1 functions differently than 2008R2 * Windows 2016 broke compatibility with 2012R2 by replacing some classes Some of these differences are undocumented, too, which is just lovely. Most of these changes are relatively easy to handle, but the differences between 2008R2's and 2012's implementations of the V1 API result in libvirt code with a lot of conditionals containing obscure format strings in the 2008R2 blocks. Windows 2008R2's extended support ended January 14, 2020: https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2008-r2 Windows 2012's mainstream support ended in 2018, but it still has extended support through October 10, 2023: https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2012 Since 2008R2 is no longer supported by Microsoft, I propose removing support for it from libvirt. Thoughts? -- Matt

4 7

[libvirt PATCH 0/2] Run full unit tests on i686 too
by Daniel P. Berrangé 02 Nov '20

02 Nov '20

Daniel P. Berrangé (2): gitlab: run unit tests in i686 cross build scripts: trim "__attribute__((packed))" in RPC struct diff .gitlab-ci.yml | 1 + scripts/check-remote-protocol.py | 6 ++++++ 2 files changed, 7 insertions(+) -- 2.28.0

2 3

[PATCH] storagepoolxml2argvtest: Populate test entries for macOS
by Roman Bolshakov 31 Oct '20

31 Oct '20

One of the cases fails on macOS: 15) Storage Pool XML-2-argv pool-netfs-gluster ... In '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv': Offset 39 Expect [-o direct-io-mode=1 /mnt/gluster] Actual [/mnt/gluster -o direct-io-mode=1] glusterfs has not been tested on macOS but for now we can just make tests happy by providing them with the data they expect. Likely, there'll be updates to the argv files in the future. storagepoolxml2argvtest passes after the change. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tests/storagepoolxml2argvdata/pool-fs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-darwin.argv | 1 + tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv | 1 + .../storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv | 1 + tests/storagepoolxml2argvtest.c | 2 ++ 7 files changed, 8 insertions(+) create mode 100644 tests/storagepoolxml2argvdata/pool-fs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv diff --git a/tests/storagepoolxml2argvdata/pool-fs-darwin.argv b/tests/storagepoolxml2argvdata/pool-fs-darwin.argv new file mode 100644 index 0000000000..537ce4cee5 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-fs-darwin.argv @@ -0,0 +1 @@ +mount -t ext3 /dev/sda6 /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv new file mode 100644 index 0000000000..888a0161b8 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-auto-darwin.argv @@ -0,0 +1 @@ +mount localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv new file mode 100644 index 0000000000..2fef6f5782 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-cifs-darwin.argv @@ -0,0 +1 @@ +mount -t cifs //example.com/samba_share /mnt/cifs -o guest diff --git a/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv new file mode 100644 index 0000000000..04127c5087 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-darwin.argv @@ -0,0 +1 @@ +mount -t nfs localhost:/var/lib/libvirt/images /mnt diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv new file mode 100644 index 0000000000..97be9cbeb3 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster-darwin.argv @@ -0,0 +1 @@ +mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1 diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv new file mode 100644 index 0000000000..f26656d5b8 --- /dev/null +++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-darwin.argv @@ -0,0 +1 @@ +mount -t nfs localhost:/var/lib/libvirt/images /mnt -o nfsvers=3 diff --git a/tests/storagepoolxml2argvtest.c b/tests/storagepoolxml2argvtest.c index 967d1f21a8..ecce3ab7d0 100644 --- a/tests/storagepoolxml2argvtest.c +++ b/tests/storagepoolxml2argvtest.c @@ -126,6 +126,8 @@ mymain(void) const char *platform = "-linux"; #elif defined(__FreeBSD__) const char *platform = "-freebsd"; +#elif defined(__APPLE__) + const char *platform = "-darwin"; #else const char *platform = ""; #endif -- 2.28.0

2 2

[PATCH] tests: Enable virpcimock on macOS
by Roman Bolshakov 31 Oct '20

31 Oct '20

In general, it has little sense to use Linux pci mock on macOS but virPCIDeviceAddressGetIOMMUGroupNum() is relying on the filesystem layout mocked by virpcimock. And all tests that rely on correct execution of virPCIDeviceAddressGetIOMMUGroupNum() fail. Additionally, missing initialization is added to close() to avoid invocation of real_close() before it's set up. The change fixes qemuhotplugtest, qemumemlocktest and qemuxml2xmltest. Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tests/virpcimock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 064218d275..5cd688c825 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -18,7 +18,7 @@ #include <config.h> -#if defined(__linux__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) # include "virmock.h" # include <unistd.h> # include <fcntl.h> @@ -1123,6 +1123,8 @@ opendir(const char *path) int close(int fd) { + init_syms(); + if (remove_fd(fd) < 0) return -1; return real_close(fd); -- 2.28.0

2 2

[libvirt PATCH v6 1/2] news: mention vdpa support
by Jonathon Jongsma 31 Oct '20

31 Oct '20

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NEWS.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 2fef3f706c..384ee94480 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -43,6 +43,12 @@ v6.9.0 (unreleased) Implement virito-9p shared filesystem using the ``<filesystem/>`` element. + * qemu: Add support for vDPA network devices. + + VMs using the QEMU hypervisor can now specify vDPA network devices using + ``<interface type='vdpa'>``. Host vDPA devices are also now included in the + node device APIs. + * **Improvements** * **Bug fixes** -- 2.26.2

2 3

[PATCH] docs/system: Deprecate raspi2/raspi3 machine aliases
by Philippe Mathieu-Daudé 30 Oct '20

30 Oct '20

Since commit aa35ec2213b ("hw/arm/raspi: Use more specific machine names") the raspi2/raspi3 machines have been renamed as raspi2b/raspi3b. As more Raspberry Pi 2/3 models are emulated, in order to avoid confusion deprecate the raspi2/raspi3 machine aliases. Signed-off-by: Philippe Mathieu-Daudé <f4bug(a)amsat.org> --- docs/system/deprecated.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 905628f3a0c..f0c7aaeb2ff 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -355,6 +355,11 @@ This machine has been renamed ``fuloong2e``. These machine types are very old and likely can not be used for live migration from old QEMU versions anymore. A newer machine type should be used instead. +Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) +''''''''''''''''''''''''''''''''''''' + +These machines have been respectively renamed ``raspi2b`` and ``raspi3b``. + Device options -------------- -- 2.26.2

3 5

Entering freeze for libvirt-6.9.0
by Jiri Denemark 29 Oct '20

29 Oct '20

I have just tagged v6.9.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

3 3

[libvirt PATCH] tests: fix stat mocking with Fedora rawhide
by Daniel P. Berrangé 29 Oct '20

29 Oct '20

GLibC has a really complicated way of dealing with the 'stat' function historically, which means our mocks in turn have to look at four different possible functions to replace, stat, stat64, __xstat, __xstat64. In Fedora 33 and earlier: - libvirt.so links to __xstat64 - libc.so library exports stat, stat64, __xstat, __xstat64 - sys/stat.h header exposes stat and __xstat In Fedora 34 rawhide: - libvirt.so links to stat64 - libc.so library exports stat, stat64, __xstat, __xstat64 - sys/stat.h header exposes stat Historically we only looked at the exported symbols from libc.so to decide which to mock. In F34 though we must not consider __xstat / __xstat64 though because they only existance for binary compatibility. Newly built binaries won't reference them. Thus we must introduce a header file check into our logic for deciding which symbol to mock. We must ignore the __xstat / __xstat64 symbols if they don't appear in the sys/stat.h header, even if they appear in libc.so Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Validated with this pipeline: https://gitlab.com/berrange/libvirt/-/pipelines/209361200 meson.build | 28 ++++++++++++----- tests/virmockstathelpers.c | 62 ++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/meson.build b/meson.build index c3ba34bbe0..365c16d167 100644 --- a/meson.build +++ b/meson.build @@ -636,10 +636,6 @@ libvirt_export_dynamic = cc.first_supported_link_argument([ # check availability of various common functions (non-fatal if missing) functions = [ - '__lxstat', - '__lxstat64', - '__xstat', - '__xstat64', 'elf_aux_info', 'fallocate', 'getauxval', @@ -653,8 +649,6 @@ functions = [ 'getuid', 'getutxid', 'if_indextoname', - 'lstat', - 'lstat64', 'mmap', 'newlocale', 'pipe2', @@ -666,12 +660,23 @@ functions = [ 'setgroups', 'setns', 'setrlimit', - 'stat', - 'stat64', 'symlink', 'sysctlbyname', ] +stat_functions = [ + '__lxstat', + '__lxstat64', + '__xstat', + '__xstat64', + 'lstat', + 'lstat64', + 'stat', + 'stat64', +] + +functions += stat_functions + foreach function : functions if cc.has_function(function) conf.set('WITH_@0@'.format(function.to_upper()), 1) @@ -679,6 +684,13 @@ foreach function : functions endforeach +foreach function : stat_functions + if cc.has_header_symbol('sys/stat.h', function) + conf.set('WITH_@0@_DECL'.format(function.to_upper()), 1) + endif +endforeach + + # various header checks headers = [ diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 5c9759551d..3bd2437ffe 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -67,39 +67,49 @@ * - If __xstat & __xstat64 exist, then stat & stat64 will not exist * as symbols in the library, so the latter should not be mocked. * + * - If __xstat exists in the library, but not the header than it + * it is just there for binary back compat and should not be + * mocked + * * The same all applies to lstat() */ +#if !defined(WITH___XSTAT_DECL) +# if defined(WITH_STAT) +# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) || defined(__APPLE__) +# define MOCK_STAT +# endif +# endif +# if defined(WITH_STAT64) +# define MOCK_STAT64 +# endif +#else /* WITH___XSTAT_DECL */ +# if defined(WITH___XSTAT) && !defined(WITH___XSTAT64) +# define MOCK___XSTAT +# endif +# if defined(WITH___XSTAT64) +# define MOCK___XSTAT64 +# endif +#endif /* WITH___XSTAT_DECL */ -#if defined(WITH_STAT) -# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) || defined(__APPLE__) -# define MOCK_STAT +#if !defined(WITH___LXSTAT_DECL) +# if defined(WITH_LSTAT) +# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) || defined(__APPLE__) +# define MOCK_LSTAT +# endif # endif -#endif -#if defined(WITH_STAT64) && !defined(WITH___XSTAT64) -# define MOCK_STAT64 -#endif -#if defined(WITH___XSTAT) && !defined(WITH___XSTAT64) -# define MOCK___XSTAT -#endif -#if defined(WITH___XSTAT64) -# define MOCK___XSTAT64 -#endif -#if defined(WITH_LSTAT) -# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) || defined(__APPLE__) -# define MOCK_LSTAT +# if defined(WITH_LSTAT64) +# define MOCK_LSTAT64 # endif -#endif -#if defined(WITH_LSTAT64) && !defined(WITH___LXSTAT64) -# define MOCK_LSTAT64 -#endif -#if defined(WITH___LXSTAT) && !defined(WITH___LXSTAT64) -# define MOCK___LXSTAT -#endif -#if defined(WITH___LXSTAT64) -# define MOCK___LXSTAT64 -#endif +#else /* WITH___LXSTAT_DECL */ +# if defined(WITH___LXSTAT) && !defined(WITH___LXSTAT64) +# define MOCK___LXSTAT +# endif +# if defined(WITH___LXSTAT64) +# define MOCK___LXSTAT64 +# endif +#endif /* WITH___LXSTAT_DECL */ #ifdef MOCK_STAT static int (*real_stat)(const char *path, struct stat *sb); -- 2.28.0

2 2

[PATCH] rpm: Fix handling of SOURCE_DATE_EPOCH
by Neal Gompa 29 Oct '20

29 Oct '20

Contemporary versions of Fedora automatically set SOURCE_DATE_EPOCH based on the changelog entry date stamp. In scenarios where it already is defined, we do not want to redefine it. Additionally, when building the libvirt package in an Open Build Service instance, the spec file is not present in %_specdir, but instead in %_sourcedir. Signed-off-by: Neal Gompa <ngompa13(a)gmail.com> --- libvirt.spec.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b974..eb0fba4b5a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1128,7 +1128,16 @@ exit 1 # place macros above and build commands below this comment -export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) +if [ -z "${SOURCE_DATE_EPOCH}" ]; then +# If SOURCE_DATE_EPOCH is not defined, set it based on spec file + if [ ! -f "%{_specdir}/%{name}.spec" ]; then + # OBS does not install the spec file into the specdir + SPECFILE_PATH="%{_sourcedir}/%{name}.spec" + else + SPECFILE_PATH="%{_specdir}/%{name}.spec" + fi + export SOURCE_DATE_EPOCH=$(stat --printf='%Y' ${SPECFILE_PATH}) +fi %meson \ -Drunstatedir=%{_rundir} \ -- 2.28.0

3 9

[libvirt PATCH 0/2] Fix disabling of libssh/libssh2 in RPM build
by Daniel P. Berrangé 29 Oct '20

29 Oct '20

RHEL builds disable libssh2, and build root lack libssh2-devel. The RPM build fails though because meson looks for libssh2 and has it set to "enabled", not "auto" or "disabled". Daniel P. Berrangé (2): rpm: remove with_bash_completion condition rpm: tell meson whether to use libssh or libssh2 explicitly libvirt.spec.in | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) -- 2.26.2

3 7

[PATCH 0/3] qemu: sync backing chain update in virDomainGetBlockJobInfo
by Nikolay Shirokovskiy 29 Oct '20

29 Oct '20

The issue is desciribed in detail in last patch. I've already tried to address it in [1]. It was not good at all. Actually it was waiting for event processing in worker thread but that processing blocked by qemuDomainGetBlockJobInfo itself holding the job. Now with help of the 1st patch the block job event offloaded to the worker thread can be processed in qemuDomainGetBlockJobInfo. [1] [PATCH 1/1] qemu: sync blockjob finishing in qemuDomainGetBlockJobInfo https://www.redhat.com/archives/libvir-list/2019-November/msg01366.html Nikolay Shirokovskiy (3): qemu: add option to process offloaded legacy blockjob event ealier qemu: update legacy block job sync after offloading changes qemu: sync backing chain update in virDomainGetBlockJobInfo src/qemu/qemu_driver.c | 26 ++++++++++++-------------- src/qemu/qemu_process.c | 28 +++++++++++++++++++--------- 2 files changed, 31 insertions(+), 23 deletions(-) -- 1.8.3.1

2 8

question regarding systemd ordering of libvirt services
by Jim Fehlig 28 Oct '20

28 Oct '20

Hi All, I'm not sure if the following problem is in systemd or libvirt. When restarting services and sockets *and* libvirt-guests.service is running, the latter will sometimes hang when trying to connect to libvirtd. Even though libvirt-guests has 'Wants=libvirtd.service' and 'After=libvirtd.service', we can see via journalctl that it is not shutdown before libvirtd when executing something like systemctl try-restart libvirtd.service libvirtd.socket libvirtd-ro.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virt-guest-shutdown.target Oct 28 15:53:31 systemd[1]: Stopping Virtualization daemon... Oct 28 15:53:31 systemd[1]: libvirtd.service: Succeeded. Oct 28 15:53:31 systemd[1]: Stopped Virtualization daemon. Oct 28 15:53:31 systemd[1]: libvirtd-admin.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:53:31 systemd[1]: libvirtd-ro.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: libvirtd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: virtlockd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: virtlogd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... In this case, the try-restart command hung and libvirt-guests was stuck trying to connect to libvirtd. In the following case, the try-restart worked since libvirtd was started again before libvirt-guests was stopped! Oct 28 15:19:02 systemd[1]: Stopping Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopped Virtualization daemon. Oct 28 15:19:02 systemd[1]: Closed Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Starting Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Virtualization daemon. Oct 28 15:19:02 libvirt-guests.sh[4912]: Running guests on default URI: no running guests. Oct 28 15:19:02 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:19:02 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Suspend/Resume Running libvirt Guests. Adding 'Requires=libvirtd.service' to virt-guest-shutdown.target results in something more reasonable Oct 28 15:40:00 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 libvirt-guests.sh[5245]: Running guests on default URI: no running guests. Oct 28 15:40:00 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:40:00 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Virtualization daemon... Oct 28 15:40:00 systemd[1]: Stopped Virtualization daemon. Oct 28 15:40:00 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Starting Virtualization daemon... Oct 28 15:40:00 systemd[1]: Started Virtualization daemon. Oct 28 15:40:00 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 systemd[1]: Started Suspend/Resume Running libvirt Guests. I found that 'Wants=libvirtd.service' in virt-guest-shutdown.target was not strong enough. Should virt-guest-shutdown.target 'Requires=libvirtd.service', or do I need to look closer at systemd (systemd-246)? Regards, Jim

1 0

[PATCH] Revert "spec: Simplify setting features off by default"
by Neal Gompa 28 Oct '20

28 Oct '20

As it turns out, the rather complicated structure that is currently used for enabling or disabling features in the libvirt build does not cleanly map well to RPM's bcond feature. Consequently, we need these back in order to support trivially activating these features through extra macros as build inputs. This reverts commit 31d687a3218c9072d7050dd608e013e063ca180f. Signed-off-by: Neal Gompa <ngompa13(a)gmail.com> --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b974..84515cc7de 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -98,14 +98,14 @@ %define with_numactl 0%{!?_without_numactl:1} # A few optional bits off by default, we enable later -%define with_fuse 0 -%define with_sanlock 0 -%define with_numad 0 -%define with_firewalld_zone 0 -%define with_libssh2 0 -%define with_wireshark 0 -%define with_libssh 0 -%define with_dmidecode 0 +%define with_fuse 0%{!?_without_fuse:0} +%define with_sanlock 0%{!?_without_sanlock:0} +%define with_numad 0%{!?_without_numad:0} +%define with_firewalld_zone 0%{!?_without_firewalld:0} +%define with_libssh2 0%{!?_without_libssh2:0} +%define with_wireshark 0%{!?_without_wireshark:0} +%define with_libssh 0%{!?_without_libssh:0} +%define with_dmidecode 0%{!?_without_dmidecode:0} # Finally set the OS / architecture specific special cases -- 2.28.0

3 5

[PATCH 00/12] use g_autoptr for all DIR*
by Laine Stump 28 Oct '20

28 Oct '20

I don't even remember why I started looking at this. I think that again I was considering changing some function, and making the DIR* in that function autoclose was a prerequisite for a reasonably clean addition to the function. I eventually gave up on the other plan (probably because it was a bad idea), but decided that the DIR*'s really did need to autoclose. In the end, all uses of DIR* could be easily converted to use g_autoptr. Laine Stump (12): consistently use VIR_DIR_CLOSE() instead of virDirClose() tools: reduce scope of a DIR* in virHostValidateIOMMU() storage: remove extraneous call to VIR_DIR_CLOSE() util: reduce scope of a DIR * in virCgroupV1SetOwner() util: manually set dirp to NULL after closing in virCapabilitiesInitCache() util: change virDirClose to take a DIR* instead of DIR**. util: declare g_autoptr cleanup function to auto-close DIR* change DIR* int g_autoptr(DIR) where appropriate conf: convert final DIR* to g_autoptr util: remove unused VIR_DIR_CLOSE() macro util: refactor function to simplify and remove label remove unnecessary cleanup labels and unused return variables src/bhyve/bhyve_capabilities.c | 3 +- src/conf/capabilities.c | 5 +- src/conf/virdomainobjlist.c | 3 +- src/conf/virnetworkobj.c | 44 +++++--------- src/conf/virnwfilterbindingobjlist.c | 3 +- src/conf/virnwfilterobj.c | 3 +- src/conf/virsecretobj.c | 3 +- src/conf/virstorageobj.c | 6 +- src/openvz/openvz_conf.c | 3 +- src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_interop_config.c | 14 ++--- src/security/security_selinux.c | 8 +-- src/storage/storage_backend_iscsi.c | 3 +- src/storage/storage_util.c | 69 ++++++++------------- src/util/vircgroup.c | 23 +++---- src/util/vircgroupv1.c | 5 +- src/util/vircommand.c | 12 ++-- src/util/virdevmapper.c | 9 +-- src/util/virfile.c | 65 ++++++++------------ src/util/virfile.h | 4 +- src/util/virhook.c | 8 +-- src/util/virhostcpu.c | 6 +- src/util/virnetdev.c | 13 ++-- src/util/virnuma.c | 24 +++----- src/util/virpci.c | 91 +++++++++++----------------- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 30 ++++----- src/util/virscsi.c | 32 ++++------ src/util/virscsihost.c | 3 +- src/util/virusb.c | 3 +- src/util/virutil.c | 26 +++----- src/util/virvhba.c | 20 +++--- tests/testutilsqemu.c | 35 ++++------- tests/virschematest.c | 3 +- tools/virt-host-validate-common.c | 4 +- 35 files changed, 206 insertions(+), 386 deletions(-) -- 2.26.2

2 15

[PATCH] node_device: fix leak of DIR*
by Laine Stump 28 Oct '20

28 Oct '20

Commit 53aec799fa31 introduced the function udevGetVDPACharDev(), which scans a directory using virDirOpenIfExists() and virDirRead(). It unfortunately forgets to close the DIR* when it is finished with it. This patch fixes that omission. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/node_device/node_device_udev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index b1b8427c05..ec0bf9192b 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1162,6 +1162,7 @@ udevGetVDPACharDev(const char *sysfs_path, virReportError(VIR_ERR_INTERNAL_ERROR, _("vDPA chardev path '%s' does not exist"), chardev); + VIR_DIR_CLOSE(dir); return -1; } VIR_DEBUG("vDPA chardev is at '%s'", chardev); @@ -1171,6 +1172,8 @@ udevGetVDPACharDev(const char *sysfs_path, } } + VIR_DIR_CLOSE(dir); + if (direrr < 0) return -1; -- 2.26.2

3 2

[libvirt PATCH v2] libvirt-guests: Sync time for autostarted guests
by Tim Wiederhake 28 Oct '20

28 Oct '20

From: Orion Poplawski <orion(a)nwra.com> Setting SYNC_TIME=1 does not work on autostarted guests. See https://bugzilla.redhat.com/show_bug.cgi?id=1555398. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- tools/libvirt-guests.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index d69df908d2..87f96af14d 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -206,9 +206,9 @@ start() { retval run_virsh "$uri" start $bypass "$name" \ >/dev/null && \ gettext "done"; echo - if "$sync_time"; then - run_virsh "$uri" domtime --sync "$name" >/dev/null - fi + fi + if "$sync_time"; then + run_virsh "$uri" domtime --sync "$name" >/dev/null fi fi done -- 2.26.2

2 1

migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 28 Oct '20

28 Oct '20

V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "getdirtyrate". instructions: bash# virsh getdirtyrate --help NAME getdirtyrate - Get a vm's memory dirty rate SYNOPSIS getdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, a valid range of values is [1, 60], and would default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh getdirtyrate --calculate --query --domain vm0 --seconds 1 status: measured startTime: 820148 calcTime: 1 s dirtyRate: 6 MB/s Hao Wang (7): migration/dirtyrate: Introduce virDomainDirtyRateInfo structure migration/dirtyrate: set up framwork of domainGetDirtyRateInfo API migration/dirtyrate: Implement qemuDomainGetDirtyRateInfo migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuMonitorJSONExtractDirtyRateInfo migration/dirtyrate: Introduce getdirtyrate virsh api include/libvirt/libvirt-domain.h | 56 ++++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 46 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 67 ++++++++++++++++++ src/qemu/qemu_migration.c | 59 ++++++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 8 +++ src/qemu/qemu_monitor_json.c | 97 ++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 +++++- tools/virsh-domain.c | 112 +++++++++++++++++++++++++++++++ 14 files changed, 520 insertions(+), 1 deletion(-) -- 2.23.0

2 9

[PULL 06/12] nbd: Update qapi to support exporting multiple bitmaps
by Eric Blake 27 Oct '20

27 Oct '20

Since 'block-export-add' is new to 5.2, we can still tweak the interface; there, allowing 'bitmaps':['str'] is nicer than 'bitmap':'str'. This wires up the qapi and qemu-nbd changes to permit passing multiple bitmaps as distinct metadata contexts that the NBD client may request, but the actual support for more than one will require a further patch to the server. Note that there are no changes made to the existing deprecated 'nbd-server-add' command; this required splitting the QAPI type BlockExportOptionsNbd, which fortunately does not affect QMP introspection. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20201027050556.269064-5-eblake(a)redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/system/deprecated.rst | 3 ++- qapi/block-export.json | 41 +++++++++++++++++++++++++++----------- blockdev-nbd.c | 6 +++++- nbd/server.c | 19 ++++++++++++------ qemu-nbd.c | 18 ++++++++--------- 5 files changed, 58 insertions(+), 29 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 0ebce37a1919..32a0e620dbb9 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -257,7 +257,8 @@ the 'wait' field, which is only applicable to sockets in server mode '''''''''''''''''''''''''''''''''''''''''''''''''''''''' Use the more generic commands ``block-export-add`` and ``block-export-del`` -instead. +instead. As part of this deprecation, where ``nbd-server-add`` used a +single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. Human Monitor Protocol (HMP) commands ------------------------------------- diff --git a/qapi/block-export.json b/qapi/block-export.json index 480c497690b0..c4125f4d2104 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -63,10 +63,10 @@ '*max-connections': 'uint32' } } ## -# @BlockExportOptionsNbd: +# @BlockExportOptionsNbdBase: # -# An NBD block export (options shared between nbd-server-add and the NBD branch -# of block-export-add). +# An NBD block export (common options shared between nbd-server-add and +# the NBD branch of block-export-add). # # @name: Export name. If unspecified, the @device parameter is used as the # export name. (Since 2.12) @@ -74,15 +74,27 @@ # @description: Free-form description of the export, up to 4096 bytes. # (Since 5.0) # -# @bitmap: Also export the dirty bitmap reachable from @device, so the -# NBD client can use NBD_OPT_SET_META_CONTEXT with -# "qemu:dirty-bitmap:NAME" to inspect the bitmap. (since 4.0) -# # Since: 5.0 ## +{ 'struct': 'BlockExportOptionsNbdBase', + 'data': { '*name': 'str', '*description': 'str' } } + +## +# @BlockExportOptionsNbd: +# +# An NBD block export (distinct options used in the NBD branch of +# block-export-add). +# +# @bitmaps: Also export each of the named dirty bitmaps reachable from +# @device, so the NBD client can use NBD_OPT_SET_META_CONTEXT with +# the metadata context name "qemu:dirty-bitmap:BITMAP" to inspect +# each bitmap. +# +# Since: 5.2 +## { 'struct': 'BlockExportOptionsNbd', - 'data': { '*name': 'str', '*description': 'str', - '*bitmap': 'str' } } + 'base': 'BlockExportOptionsNbdBase', + 'data': { '*bitmaps': ['str'] } } ## # @BlockExportOptionsVhostUserBlk: @@ -106,19 +118,24 @@ ## # @NbdServerAddOptions: # -# An NBD block export. +# An NBD block export, per legacy nbd-server-add command. # # @device: The device name or node name of the node to be exported # # @writable: Whether clients should be able to write to the device via the # NBD connection (default false). # +# @bitmap: Also export a single dirty bitmap reachable from @device, so the +# NBD client can use NBD_OPT_SET_META_CONTEXT with the metadata +# context name "qemu:dirty-bitmap:BITMAP" to inspect the bitmap +# (since 4.0). +# # Since: 5.0 ## { 'struct': 'NbdServerAddOptions', - 'base': 'BlockExportOptionsNbd', + 'base': 'BlockExportOptionsNbdBase', 'data': { 'device': 'str', - '*writable': 'bool' } } + '*writable': 'bool', '*bitmap': 'str' } } ## # @nbd-server-add: diff --git a/blockdev-nbd.c b/blockdev-nbd.c index cee9134b12eb..d8443d235b73 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -209,8 +209,12 @@ void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp) .has_writable = arg->has_writable, .writable = arg->writable, }; - QAPI_CLONE_MEMBERS(BlockExportOptionsNbd, &export_opts->u.nbd, + QAPI_CLONE_MEMBERS(BlockExportOptionsNbdBase, &export_opts->u.nbd, qapi_NbdServerAddOptions_base(arg)); + if (arg->has_bitmap) { + export_opts->u.nbd.has_bitmaps = true; + QAPI_LIST_PREPEND(export_opts->u.nbd.bitmaps, g_strdup(arg->bitmap)); + } /* * nbd-server-add doesn't complain when a read-only device should be diff --git a/nbd/server.c b/nbd/server.c index 08b621f70a3a..8d01662b4511 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1474,6 +1474,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, uint64_t perm, shared_perm; bool readonly = !exp_args->writable; bool shared = !exp_args->writable; + strList *bitmaps; int ret; assert(exp_args->type == BLOCK_EXPORT_TYPE_NBD); @@ -1533,12 +1534,18 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, } exp->size = QEMU_ALIGN_DOWN(size, BDRV_SECTOR_SIZE); - if (arg->bitmap) { + /* XXX Allow more than one bitmap */ + if (arg->bitmaps && arg->bitmaps->next) { + error_setg(errp, "multiple bitmaps per export not supported yet"); + return -EOPNOTSUPP; + } + for (bitmaps = arg->bitmaps; bitmaps; bitmaps = bitmaps->next) { + const char *bitmap = bitmaps->value; BlockDriverState *bs = blk_bs(blk); BdrvDirtyBitmap *bm = NULL; while (bs) { - bm = bdrv_find_dirty_bitmap(bs, arg->bitmap); + bm = bdrv_find_dirty_bitmap(bs, bitmap); if (bm != NULL) { break; } @@ -1548,7 +1555,7 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, if (bm == NULL) { ret = -ENOENT; - error_setg(errp, "Bitmap '%s' is not found", arg->bitmap); + error_setg(errp, "Bitmap '%s' is not found", bitmap); goto fail; } @@ -1562,15 +1569,15 @@ static int nbd_export_create(BlockExport *blk_exp, BlockExportOptions *exp_args, ret = -EINVAL; error_setg(errp, "Enabled bitmap '%s' incompatible with readonly export", - arg->bitmap); + bitmap); goto fail; } bdrv_dirty_bitmap_set_busy(bm, true); exp->export_bitmap = bm; - assert(strlen(arg->bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); + assert(strlen(bitmap) <= BDRV_BITMAP_MAX_NAME_SIZE); exp->export_bitmap_context = g_strdup_printf("qemu:dirty-bitmap:%s", - arg->bitmap); + bitmap); assert(strlen(exp->export_bitmap_context) < NBD_MAX_STRING_SIZE); } diff --git a/qemu-nbd.c b/qemu-nbd.c index a0701cdf369d..74e73a74657b 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -574,7 +574,7 @@ int main(int argc, char **argv) QDict *options = NULL; const char *export_name = NULL; /* defaults to "" later for server mode */ const char *export_description = NULL; - const char *bitmap = NULL; + strList *bitmaps = NULL; const char *tlscredsid = NULL; bool imageOpts = false; bool writethrough = true; @@ -690,7 +690,7 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'B': - bitmap = optarg; + QAPI_LIST_PREPEND(bitmaps, g_strdup(optarg)); break; case 'k': sockpath = optarg; @@ -786,7 +786,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } if (export_name || export_description || dev_offset || - device || disconnect || fmt || sn_id_or_name || bitmap || + device || disconnect || fmt || sn_id_or_name || bitmaps || seen_aio || seen_discard || seen_cache) { error_report("List mode is incompatible with per-device settings"); exit(EXIT_FAILURE); @@ -1067,12 +1067,12 @@ int main(int argc, char **argv) .has_writable = true, .writable = !readonly, .u.nbd = { - .has_name = true, - .name = g_strdup(export_name), - .has_description = !!export_description, - .description = g_strdup(export_description), - .has_bitmap = !!bitmap, - .bitmap = g_strdup(bitmap), + .has_name = true, + .name = g_strdup(export_name), + .has_description = !!export_description, + .description = g_strdup(export_description), + .has_bitmaps = !!bitmaps, + .bitmaps = bitmaps, }, }; blk_exp_add(export_opts, &error_fatal); -- 2.29.0

1 0

[PATCH] re-add cscope db files to .gitignore
by Laine Stump 27 Oct '20

27 Oct '20

Commit f7114e61db removed these lines as being "old and obsolete". cscope may be old, but it is still very much useful and used (i.e. *not* obsolete), and having the files show up as "Untracked files:" every time git status is run is annoying. Signed-off-by: Laine Stump <laine(a)redhat.com> --- I'm not sure why I didn't notice this omission until now, but a couple weeks ago it resulted in my accidentally committing my cscope.out and cscope.files to git (fortunately I noticed it before I posted the patch!) It could be argued (as abologna did on IRC) that users should just add these to their private user-global .gitignore, but if that's the case, then the vim and emacs-related files should also be removed from libvirt's .gitignore (also suggested by abologna :-)). However if you do that, then any time you checkout libvirt on some random new machine where you haven't imported your personal home directory template will end up showing these by-product files. Also, somebody newly entering the project will potentially have the files showing up and bothering them. Anyway, I'm not necessarily advocating for re-adding the cscope files, but sending a patch seemed to be like the most useful way of discussing it. .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 6d44a50061..feb2bcb017 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,12 @@ .#* *~ +# cscope related ignores +cscope.files +cscope.in.out +cscope.out +cscope.po.out + # git related ignores *.rej *.orig -- 2.26.2

2 1

[PATCH] cpu_ppc64: compare CPU function is ignoring return value
by Julio Faracco 27 Oct '20

27 Oct '20

Function to compare CPU on 64-bit PowerPC is ignoring the flag to avoid failure in case of CPUs (host and guest) are incompatible. Basically, the function is returning -1 even if it is set to continue. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/cpu/cpu_ppc64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 2fedcd25da..23ea5a6a3e 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -517,7 +517,7 @@ virCPUppc64Compare(virCPUDefPtr host, virCPUDefPtr cpu, bool failIncompatible) { - virCPUCompareResult ret; + virCPUCompareResult ret = -1; g_autofree char *message = NULL; if (!host || !host->model) { @@ -528,7 +528,7 @@ virCPUppc64Compare(virCPUDefPtr host, VIR_WARN("unknown host CPU"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; } - return -1; + return ret; } ret = ppc64Compute(host, cpu, NULL, &message); -- 2.25.1

2 2

[PATCH] util: Avoid double free in virProcessSetAffinity
by Martin Kletzander 27 Oct '20

27 Oct '20

The cpu mask was free()'d immediately on any error and at the end of the function, where it was expected that it would either error out and return or goto another allocation if the code was to fail. However since commit 9514e24984ee the error path did not return in one new case which caused double-free in such situation. In order to make the code more straightforward just free the mask after it's been used even before checking the return code of the call. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1819801 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virprocess.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9366f0630c42..37413796b3f6 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -447,6 +447,7 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) int numcpus = 1024; size_t masklen; cpu_set_t *mask; + int rv = -1; VIR_DEBUG("Set process affinity on %lld", (long long)pid); @@ -472,8 +473,10 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) CPU_SET_S(i, masklen, mask); } - if (sched_setaffinity(pid, masklen, mask) < 0) { - CPU_FREE(mask); + rv = sched_setaffinity(pid, masklen, mask); + CPU_FREE(mask); + + if (rv < 0) { if (errno == EINVAL && numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ numcpus = numcpus << 2; @@ -488,7 +491,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map, bool quiet) return -1; } } - CPU_FREE(mask); return 0; } -- 2.28.0

2 1