- Devel - libvirt List Archives

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

05 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 05 Nov '20

05 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 05 Nov '20

05 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 04 Nov '20

04 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 04 Nov '20

04 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é 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> --- 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 03 Nov '20

03 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 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/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