From 22ef7b3e82a64118c8360f1e57130fbe0e67ebaa Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 3 Aug 2023 19:51:28 +0000
Subject: libvirt: update to 9.6.0

Bumping libvirt to version v9.6.0-18-g1ca3c339a1, which comprises the following commits:

    fb12c5e049 Release of libvirt-9.6.0
    fe306190bf NEWS: Mention CVE-2023-3750 and BeeGFS migration support
    a3a8cc0415 Translated using Weblate (Korean)
    c964dd09f0 NEWS: Document my contributions for upcoming release
    010cfec969 Translated using Weblate (Ukrainian)
    caf4344339 Translated using Weblate (Czech)
    e33054b72c rpm: Delete unused macros
    a7bc8d1606 rpm: Switch to new macros for handling of systemd units
    3bfc76a953 rpm: Introduce new macros for handling of systemd units
    df1e4e34cc rpm: Remove custom libvirtd restart logic
    ea45933d35 rpm: Reduce use of with_modular_daemons
    1f3065a552 rpm: Reorder scriptlets
    05ef4da4d7 rpm: Style/alignment tweaks
    bdb10f9de8 rpm: Bump min_fedora
    8e958c1644 Update translation files
    dab2b7529b po: Refresh potfile for v9.6.0
    ea4c67f567 remote: handle partial data transmission
    0cec8abdba docs: formatdomain: Mention the QEMU requirement for discard_no_unref
    3d9e35b837 virrandom: Accept "nodedev" driver in virRandomGenerateWWN()
    baeefe0327 qemu_domain: Partially validate memory amounts when auto-adding NUMA node
    5b6badcfbf Translated using Weblate (Czech)
    658660681c util: file: Mark 'BeeGFS' as shared filesystem
    51ae80d6a7 ci: Switch to OpenSUSE Leap 15.5
    edf17b5e99 sync_qemu_models_i386.py: Add missing features
    a2c6000c72 cpu_map: Add missing feature "pbrsb-no"
    db81435b92 cpu_map: Add missing feature "psdp-no"
    4143916b1d cpu_map: Add missing feature "fbsdp-no"
    fb426d7957 cpu_map: Add missing feature "sbdr-ssdp-no"
    95a442dee6 cpu_map: Add missing feature "mcdt-no"
    8cb0c11f29 docs: Mention vhostuser for queues and queue_size
    ba9a8b5b56 NEWS: qemu: Implement QEMU NBD reconnect delay attribute
    411cbe7199 remote: fix stream use-after-free
    54e59e9135 net: add debug logs
    6c3ef66cc6 qemu_tpm: Try harder to create emulator state
    1b33578854 virfile: Introduce virDirIsEmpty()
    ac9c9b621f conf/domain_validate: Validate the disk queue_size
    cef25914eb conf/domain_validate.c: Improve the err for queue validation
    986596f7a5 Translated using Weblate (Swedish)
    033c4fcddf qemu_monitor: Remove helpers for 'query-commands'
    0af5a514ee qemu: capabilities: Don't probe 'query-commands'
    d8b6801095 qemu: capabilities: Probe presence of commands from QMP schema instead of 'query-commands'
    7ca777cc09 node_device: Don't leak error message buffer from virMdevctlListDefined|Active
    294cf405d5 qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN
    37f20a9bdb qemu: Always assume support for QEMU_CAPS_IDE_DRIVE_WWN
    5eed97e313 qemu: Always assume support for QEMU_CAPS_SCSI_DISK_WWN
    f276dbeefe qemu: capabilities: Update capabilities test data for qemu-8.1 dev cycle
    9a47442366 storage: Fix returning of locked objects from 'virStoragePoolObjListSearch'
    a7f7bfa347 qemuTestDriverInit: Don't autopopulate qemu capabilities when initializing driver
    b1126c46eb qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data
    f45aff1635 qemuagenttest: Use real x86_64 capabilities for parsing domain definitions
    86edcfac4d tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data
    faa4d488e5 qemumemlocktest: Use 'testQemuInsertRealCaps'
    bb142b6db1 testutilsqemu: Introduce 'testQemuInsertRealCaps' helper
    4cac4867ad testQemuGetRealCaps: Extract caching of the caps into a new helper
    b5ddd072bc testQemuGetRealCaps: Strip the default machine alias before insertion into cache
    64dcb59756 domaincapstest: Use obviously fake firmware name in capabilities
    0cbe448977 testutils: Print number of failed tests
    c90c97a734 Properly mark auto-added 'terminator' virStorageSource
    49aca0a845 qemu: driver: Reformat helpers for saving VM state
    d051e0623c util: add logging about node suspend availability
    6103584284 src: remove dep on systemd-logind.service from unit files
    29f2222dd5 util: relax requirement for logind to be running
    38abf9c34d src: set max open file limit to match systemd >= 240 defaults
    04b82f961b rpc: automatically raise max file limit in all daemons
    c41cc852f6 util: add helper for raising the max files limit
    3967174d03 util: remove pointless wrappers for setrlimit/getrlimit
    427eef8959 src: remove deps on ip[6]tables/firewalld.service from systemd units
    a315070047 src: remove After=local-fs.target from systemd units
    c7ceac59f3 tests: Refresh valgrind suppressions
    7ba20863a7 meson: Annotate each test() with 'suite'
    3cde509f1a storage: zfs: Use 'zfs list' to check pool status
    fa0d5f4ebc nodedev: report mdev persistence properly
    988f8443fb qemu: require memfd memory for virtio 'blob' support
    ecbce92371 qemu: Adapt to new way of specifying PC speaker
    f9641d2c37 qemu_capabilities: Retire QEMU_CAPS_USB_STORAGE_REMOVABLE
    1a663b53c0 qemu: Always assume QEMU_CAPS_USB_STORAGE_REMOVABLE
    d90a34cf29 virrandommock: Drop virRandomGenerateWWN
    ae7df11377 test_driver: Pass virt_type to virNodeDeviceDefParse() in testNodeDeviceCreateXML()
    b857ad0696 virrandom: Fix printf format string in virRandomGenerateWWN()
    f6e88f6113 virsh: Make cmdVersion() work with split daemon
    59d73ae768 NEWS: cpu_map: Add SapphireRapids cpu model
    c002e51dab NEWS: qemu: Support removable attribute for scsi disk
    8417c1394c qemu: S390 does not provide physical address size
    aece25f665 conf: domcaps: Add 'async-teardown' domain capability
    f5d4f5c8ee qemu: Add NUMA node automatically for memory hotplug
    2d7542a8a5 docs: expand clangd instructions
    6b8cf9ffff Translated using Weblate (Georgian)
    8311d1794f Translated using Weblate (Georgian)
    fc366d7e13 Translated using Weblate (Georgian)
    6853f83613 Translated using Weblate (Georgian)
    36b247b908 docs: Reword ninja invocation note to clarify build directory
    ef7228f5ca docs: Fix deprecated use of implicit meson "setup" command
    4d50cd23c9 docs: Point to mailing list archives from submitting-patches
    7160215146 docs: Advise running CI tests prior to submission
    941fc36f11 docs: Reword "Preparing Patches" to clarify
    3da8d8b5b1 docs: Add config instructions for clangd with libvirt
    401a6171a3 docs: Point to compiling guide from code contribution guide
    7218970862 docs: Link main "contributing" from programming-specific guide
    225f6de45f docs: Missing "full-stop"/"period" on some bullet items
    cccf129c2d docs: Link to main docs directory from Quick Links
    14026db9b0 nodedev: update mdevs from the mdevctl thread
    9b7fadc5dc nodedev: refactor mdevctl thread functions
    37481aa1f1 nodedev: transient mdev update on nodeDeviceCreateXML
    851c5f075b qemu_domain: Deduplicate targetNode check in qemuDomainDefValidateMemoryHotplugDevice()
    b9eeeebddb libxl: Advertise support for VIR_MIGRATE_CHANGE_PROTECTION
    f3ed5c2713 libxl: Don't attempt to resume domain on canceled migration
    ded44a0406 node_device: Enclose Linux specific code in ifdef __linux__
    3bf02acdc5 qemu: allow use of async teardown in domain
    65c6513811 qemu: add run-with async-teardown capability
    584820b6bb tests: add capabilities for QEMU 8.1.0 on s390x
    d8e95ab6b7 tests: remove acpi support from s390x ccw hotplug tests
    1ed695bcff qemu: Support removable for scsi disk
    5f7f6ceb47 Revert "meson: attr_dep switch to dependency()"
    00cd7d2b1a Translated using Weblate (Georgian)
    cd4bdcb8cf NEWS: Mention overrides for AppArmor profiles and abstractions
    4c6feb832f apparmor: Make all profiles extensible
    21a84ec994 apparmor: Improve virt-aa-helper include
    b6092de883 apparmor: Make abstractions extensible
    84e01d182e apparmor: Only support passt on 3.x
    63a312fa2d apparmor: Allow version-specific bits in abstractions too
    19eb8abc9a apparmor: Allow version-specific bits in profiles
    4a779f21bd meson: Detect AppArmor 3.x
    b7ca6f93f1 NEWS: Fix vertical spacing
    6742edff2e Post-release version bump to 9.6.0
    692543b5cc Release of libvirt-9.5.0
    7f1562a739 NEWS: Document changes for the release
    95ca371f3b NEWS: Move section about 'discard_no_unref' to features
    63792a286d Revert "lxc_fuse: Tell FUSE that /proc/meminfo is nonseekable"
    4163dcc4cb Translated using Weblate (Ukrainian)
    a9e7d5c587 Translated using Weblate (Korean)
    28141adfdc scripts: Fix the flake8 syntax-check failures
    d7fb8deb6a Revert "apparmor: Add support for local profile customizations"
    d725932a28 Update translation files
    db1cf10784 po: Refresh potfile for v9.5.0
    a46ad01d5e Translated using Weblate (Korean)
    2d6659e778 qemu: prevent SIGSEGV in qemuProcessHandleDumpCompleted
    83686f1eea qemu_passt: Actually use @logfd
    ceb4dc8e17 docs: Move passt log file in our example XML
    8511b96a31 qemu_passt: Precreate passt logfile
    f4fea84f59 Explicitly reject unsupported storage types for legacy config generators
    db4dd170a2 tests: qemucapabilitiesdata: Update data for qemu-8.1 dev cycle
    7b793a00bd util: don't validate empty params
    b7f7f07542 qemuDomainWaitForDeviceRemoval: recheck the value of priv->unplug.alias when timeout
    2fbc1b05d9 NEWS: Update NEWS with new discard_no_unref option
    b855f8ea1e Add discard_no_unref option for qcow2 images
    1092a88e13 qemu: capabilities: Introduce QEMU_CAPS_QCOW2_DISCARD_NO_UNREF
    91856be29b qemuxml2(argv|xml)test: Add case for validating proper DIMM slot validation
    e4b4765f4f conf: Allow omitting 'slots' attribute of <maxMemory>
    e3ce39195c qemu_domain: Properly validate count of memory slots
    a52c68443d qemu_command: Always use modern syntax of '-m'
    1dddd44451 virGlobalInit: Make glib init its own global state
    a5bf2c4bf9 NEWS: Mention an improvement for virConnectBaselineHypervisorCPU
    ce6d1dca6d qemu: Include maximum physical address size in baseline CPU
    be1b7d5b18 qemu: Report physical address size in domain capabilities
    078e645cc3 conf/nwfilter: Initialize size_t attr to zero
    e31ac985f5 meson-dist: Use shutil.copy for copying a file
    2ed41d7cd9 util: Use g_ascii_strtoll
    fd340227a7 util: Remove virStrToLong_l
    e940cac98e util: Parse RSS into ullp
    a7ee9eac83 conf: virtiofs: validate that the target dir is unique even for hotplug
    063e8b9d62 meson: Use dependency().found() instead of conf.has()
    2ef5876e2b meson: numactl_dep switch to dependency()
    dffeef89ef meson: attr_dep switch to dependency()
    63ca3e656c meson: acl_dep switch to dependency()
    97f0bd00b4 Translated using Weblate (German)
    d09b73b560 qemu: Drop @unionMems argument from qemuProcessSetupPid()
    83adba541a qemu: Allow more generous cpuset.mems for vCPUs and IOThreads
    fddbb2f12f qemu: Don't try to 'fix up' cpuset.mems after QEMU's memory allocation
    9b743ee190 apparmor: Add support for local profile customizations
    17565ee0aa qemucapabilitiestest: Add data for the qemu-8.1
    8b11489284 qemumonitorjsontest: Work around deprecation of 'vcpu' argument of 'trace-event-get-state'
    debe7f5406 Translated using Weblate (Korean)
    1b8c1ce704 virnetsshsession: Adapt to changed libssh2 API
    794c583f46 docs: fix changed API calls
    bc2c392bd1 conf: nwfilter: Refactor virNWFilterFormatParamAttributes
    3a5f9a4041 conf: nwfilter: Refactor virNWFilterIncludeParse
    9cb4e78ffd virNWFilterRuleDefDetailsFormat: Refactor formatter
    59a1455012 virNWFilterRuleParse: Refactor attribute parser
    3774fca88f virNWFilterRuleParse: Parse 'priority' via 'virXMLPropInt'
    f0c5da0f24 virNWFilterRuleDef: Turn 'action' and 'tt' into proper enum types
    43f280cc65 conf: nwfilter: Refactor XML formatting in virNWFilterRuleDefFormat
    d50eb74b9d conf: network: Refactor XML parsing in virNetworkDHCPDefParseXML
    7abf1d864b nwfilterxml2xmltest: Add test case for parser and formatter quirks
    dcd49d2cd6 util: xml: Introduce virXMLNodeGetSubelementList
    4aafa900ce virNetworkDHCPDefParseXML: Refactor cleanup
    355582e3df virNetDevBandwidthParse: Use virXMLNodeGetSubelement instead of looped parser
    036e677886 virNetDevBandwidthParseRate: Refactor parsing
    ede5ee9eca virNetDevBandwidthParse: Use 'virXMLPropUInt' to parse 'classID'
    92332ade1f virNetDevBandwidthParse: Don't validate element name
    79b04c9606 testQEMUSchemaValidateObjectMember: validate QMP object member deprecation
    9d6867198d qemuMonitorSetBlockIoThrottle: Drop 'diskalias' argument
    f0296aa9a3 qemuMonitorGetBlockIoThrottle: Drop 'diskalias' argument
    52c874d913 qemumonitorjsontest: Use 'id' instead of deprecated 'device' argument of 'block_set_io_throttle'
    4ba032a2a2 qemu: Refuse setting <iotune> for 'SD' disks
    6d6a87f229 qemuDiskConfigBlkdeviotuneEnabled: Make 'disk' argument const
    cec5a9989c qemumonitorjsontest: Drop 'schema-meta' case
    7975702aec Drop unused qemuMonitorTestAddItemParams
    6019679092 testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle: Rewrite using qemuMonitorTestAddItemVerbatim
    1885c7a9ca testQemuMonitorJSONqemuMonitorJSONSendKeyHoldtime: Rewrite using qemuMonitorTestAddItemVerbatim
    b4f07b371d testQemuAgentFSTrim: Rewrite using qemuMonitorTestAddItemVerbatim
    5e7def0b81 testQemuAgentCPU: Rewrite using qemuMonitorTestAddItemVerbatim
    f8625248ac virRaiseErrorLog: Don't skip error printing when enabling debug logging env variable
    25420111ba ci: fix Cirrus CI jobs run from merge requests
    8b9d2bda8a qemu: Set proper PCI backend for <interface/>-s that are actually hostdevs
    adf67ca987 ci: refresh with latest lcitool manifest
    f26923fb2e qemuMonitorTestAddItemExpect: Remove unused helper
    e79ccbae1c qemuMonitorJSONTestAttachOneChardev: Rewrite using qemuMonitorTestAddItemVerbatim
    9482098395 testQemuMonitorJSONAttachChardev: Move all setup code under virTestRun
    594fe5f882 qemuMonitorTestAddHandler: Remove return value
    d74f8e95e3 qemuMonitorTestAddItemVerbatim: Simplify cleanup
    2380242928 docs: Use '--exit-status=' option for 'rst2html5'
    9f49f60aca docs: go: Add 'go-import' metadata via rST
    54c1f31fda docs: page.xsl: Drop passhrough of <script> elements into header
    464450772f docs: newapi: Remove unused 'docomponents' template
    1c7335add9 qemu_passt: Format portForward device even without address
    a36318be9d conf: Reject invalid device's <seclabel relabel='yes'/> with no <label/>
    68545ed21b Post-release version bump to 9.5.0
    80d670f63d Release of libvirt-9.4.0
    80bb89ad0a Translated using Weblate (Georgian)
    0033998e9a conf: node_device: use separate variables for parsing integers
    c47e17689e include: Fix 'Since' for new VIR_MIGRATE_PARAM_COMPRESSION_* macros
    9222f35dc6 NEWS: Document my contributions for upcoming release
    632999b929 Translated using Weblate (Korean)
    e35b5df3f5 Translated using Weblate (Ukrainian)
    a1bdffdd96 qemu_command: Generate .memaddr for virtio-mem and virtio-pmem
    2c15506254 qemu: Fill virtio-mem/virtio-pmem .memaddr at runtime
    677156f662 conf: Introduce <address/> for virtio-mem and virtio-pmem
    f08309d868 conf: Run virDomainInputDefPostParse() only for VIR_DOMAIN_DEVICE_INPUT
    997994b6b1 Update translation files
    e712afcab3 po: Refresh potfile for v9.4.0
    1a86c27edb sync_qemu_models_i386.py: Add missing features
    af6b5c1edf sync_qemu_models_i386.py: Fix complaint from flake8
    b4560dc69b cpu_map: Add missing feature "vnmi"
    b038d52e30 cpu_map: Add missing feature "stibp-always-on"
    5d1a8d0053 cpu_map: Add missing feature "prefetchiti"
    e680f69f77 cpu_map: Add missing feature "null-sel-clr-base"
    822c5df993 cpu_map: Add missing feature "no-nested-data-bp"
    0876e2cd9f cpu_map: Add missing feature "lfence-always-serializing"
    877f609b8c cpu_map: Add missing feature "flush-l1d"
    bd93b13294 cpu_map: Add missing feature "fb-clear"
    aff0caeae8 cpu_map: Add missing feature "cmpccxadd"
    7d57f0f1e5 cpu_map: Add missing feature "avx-vnni-int8"
    3836efdaaf cpu_map: Add missing feature "avx-ne-convert"
    c8c44a59fe cpu_map: Add missing feature "avx-ifma"
    01be1472f9 cpu_map: Add missing feature "auto-ibrs"
    c0dfb6b953 cpu_map: Add missing feature "amx-fp16"
    c8d67f644c cpu_map: Add missing feature "amd-psfd"
    a8c983d0fa docs: Clarify values reported by virDomainMemoryStats()
    6a15e22265 docs: newapi.xsl: Generate overall docs for enums too
    1fa7443dc7 docs: newapi.xsl: Generate docs on generic typedefs
    96c8d39af0 cpu_map: Add SapphireRapids CPU model
    44a0f2f0c8 nodedev: update transient mdevs
    e53291514c qemu_hotplug: Temporarily allow emulator thread to access other NUMA nodes during mem hotplug
    3ec6d586bc qemu: Start emulator thread with more generous cpuset.mems
    c4a7f8007c qemuProcessSetupPid: Use @numatune variable more
    1bb439e4b0 qemu: Use thread-context even with numatune's restrictive mode
    1716ec3d36 cpu-data.py: Filter out apic current logical processor
    17e92b4305 NEWS: Mention support for compressing parallel migration
    3b6d69237f Revert "conf: Introduce MTE domain feature"
    4fd5f0d660 Revert "qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability"
    178a66f9af Revert "qemu: Validate MTE feature"
    167138a525 Revert "qemu: Generate command line for MTE feature"
    4850a9a39b rpm: Explain BuildRequires on qemu-img
    17c8a173b6 numa_conf: Deny other memory modes than 'restrictive' if a memnode is 'restrictive'
    f6ba9fc12a numa_conf: Move memnode mode validation into virDomainNumaDefValidate()
    a152d856c3 virDomainNumatuneNodeSpecified: Fix const correctness
    90404c5368 docs: make isa-debugcon example more useful / directly applicable
    f06d15b512 docs: fix typo in isa-debugcon example
    ffa258a39d qemu: support set parallel migration compression method
    4ab5591c95 virsh: Add migrate options to set parallel compress level
    150ae3e62b Add public API for parallel compression method
    5ee27c37e6 docs: xsl: Simplify templating XSL
    f11c773014 docs: newapi.xsl: Remove support for generating index page
    7aa2706d3b docs: html: Add a manually written index page
    02e7f8d709 css: Remove override of width for 'hvsupport' page
    dc9c6c5405 hvsupport: Split out common APIs from hypervisor API section
    eca6846376 scripts: hvsupport: Properly register virConnectOpenAuth/virConnectOpenReadOnly APIs
    ef01df4a5c docs: Remove XSLT table of contents generator
    5ff58a0ce7 docs: index: Convert to 'rst'
    c0a06c081c docs: acl: Convert to 'rst'
    0f1d6ef6e7 css: Fix styling of the "3 panel" pages
    82db6fb765 css: mobile: Make colums in "3 column" mobile layout wider
    2b9d96fcac css: mobile: Fix hiding of big logo in mobile layout
    0e8f61beba css: mobile: Fix responsive design of 'docs' and 'knowledgebase' pages
    1a39a07879 css: mobile: Replace tabs with spaces
    e51922335c css: Drop styles for '.gitmirror' class
    e21b32ed4f css: Drop styles for '.mail' class
    08de356e1d css: Drop style for 'p.image' selector
    79e1853186 css: Drop style for '#changelog' id
    e28fe28b04 css: Drop styles for '#projects' id
    af621caa6b conf: numa: Allow formatting 'none' values for 'associativity' and 'policy' of cache
    0d5fc7219a virDomainNumaDefNodeCacheParseXML: Refactor parsing of cache XML
    a8a63587ff qemuxml2xmltest: Modernize all 'audio-' cases
    c051fa874f qemuxml2argvtest: Use real caps instead of fake caps for 'audio-default-*' cases
    36d7d87c87 qemuxml2xmlout: Replace symlinks of all 'audio-' tests by real files
    b10bc8f7ab qemu: Generate command line for MTE feature
    c6c9b5d251 qemu: Validate MTE feature
    1347a19f75 qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability
    720e8f13ff conf: Introduce MTE domain feature
    37e41b7f16 qemu: Drop @forceVFIO argument of qemuDomainGetMemLockLimitBytes()
    4f355fa5b7 qemu: Drop @forceVFIO argument of qemuDomainAdjustMaxMemLock()
    c925bb9273 qemu_domin: Account for NVMe disks when calculating memlock limit on hotplug
    9884e89236 schemas: backup: Allow missing 'type' attribute for backup disk
    1222ada2af conf: backup: Fix logic for generating default backup filenames
    de48ade195 virDomainBackupDefAssignStore: Restructure control flow
    a091edf9db virmockstathelpers: Adapt to musl-1.2.4
    4a681995bc Translated using Weblate (Hungarian)
    517d76466b qemu: Update documentation for dbus_daemon qemu.conf key
    4400f63636 meson: Stop looking for dbus-daemon
    769de39f50 qemu: Find dbus-daemon at runtime
    db91bf2ba3 qemu: Update documentation for qemu.conf keys
    b134a9bd2a meson: Stop looking for QEMU helpers
    934113d376 qemu: Find helpers at runtime
    ef91f9e52a util: Introduce virFileFindInPathFull()
    d92054c867 util: Small refactor
    dcb9ee99f3 ci: integration: Flip QEMU upstream integration tests to Fedora 38
    2bb0efa367 ci: Flip mingw jobs from Fedora 37 to Fedora 38
    ffd2a97070 ci: Drop Fedora 36 target
    96ffb7318e ci: Add Fedora 38 target
    45abfaf68d Translated using Weblate (Hungarian)
    9469587314 virfirewallmock: Replace virFindFileInPath() with virFirewallDIsRegistered()
    c033377a17 util: include virfirewall.h in virfirewalld.h
    3d6bc5c611 conf: qemu: Add support for multi-channel mode for 'usb' sound cards
    783c6bc2f0 conf: Register autoptr cleanup for 'virDomainSoundDef' and refactor virDomainSoundDefParseXML
    d6d4cfa5fc qemuxml2(argv|xml)test: Modernize 'sound-device' case
    351504744e qemuxml2(argv|xml)test: Remove 'sound' case
    374c716af9 docs: formatdomain: Use code blocks to emphasize various sound device options
    30a1ceb67c qemu: Report domain name in unexpectedly closed monitor message
    25ce34998b logging: Provide empty VIRTLOGD_ARGS in the unit file
    236d2c0f4a .gitlab-ci.yml: Fix Leap 15.4 codestyle job
    9b8bb536ff qemu: hotplug: Reorder setup of disk backend metadata
    d18572b4b7 meson: Improve initconfdir defaults
    6f42d9610c meson: Move definition of os_release
    e54a419693 rpm: Set initconfdir explicitly
    32f772e986 meson: Use initconfdir
    9850b37e39 meson: Introduce initconfdir option
    4419e74117 util: Improve comment for workaround
    e533074983 qemu: Fix error message
    d4c39bad85 cpu_riscv64.c: add update() implementation
    2f197ab695 meson: Fix qemu_{user,group} defaults for Arch
    b4f5e6c91b tools: virsh-domain: display progress with enhanced granularity
    51cfca2210 tools: virsh-domain: refactor variable initialization
    4b5a9e34ad qemu: Use configured iothread poll parameters on startup
    83eee66f81 conf: Store the iothread 'poll' settings in the XML
    6df1d137dd virsh: cmdIOThreadSet: Use bigger types for --poll-grow and --poll-shrink
    6f9d66c828 qemu: Store all iothread's 'poll*' attributes as unsigned long long
    6d8dcc644c qemu: Remove iothread 'poll-' value validation
    e094d21004 virsh: cmdIOThreadSet: Refactor to use virTypedParamList
    07652410a7 virTypedParamsValidate: Allow typed params to be both _UINT and _ULLONG
    b5ee977d17 virTypedParamsValidate: Refactor variable declaration and cleanup
    111eeba7a7 util: virtypedparam: Introduce virTypedParamsGetUnsigned
    e280e83bff util: typedparam: Introduce virTypedParamListAddUnsigned
    f9f40a6d4b util: virtypedparam: Remove return values from virTypedParamListAdd* APIs
    29dd390ea6 util: virtypedparam: Store errors inside virTypedParamList
    ec3a076c9e util: virtypedparam: Refactor return value of virTypedParamListStealParams
    88925728f6 util: virtypedparam: Privatize definition of struct _virTypedParamList
    50be70ded3 Use 'virTypedParamListFetch' for extracting identity parameters list
    0fac024958 util: virtypedparam: Introduce 'virTypedParamListFetch'
    8ea33c8c18 qemuDomainGetStatsBlock: Don't directly access virTypedParamList
    e3dff704bf util: typedparam: Introduce 'virTypedParamListConcat'
    0d09e79b42 util: virtypedparam: Introduce virTypedParamListNew()
    2e18d84746 virtypedparam.h: Consistently use contemporary header style
    6813a46db5 util: virtypedparam: Simplify error handling in virTypedParamListAdd*
    ff8a626c58 virTypedParameterAssignValueVArgs: Ensure proper typed param type in caller
    81391c0e1d virTypedParamsDeserialize: Remove unnecessary line breaks
    49dc447d31 util: virtypedparam: Use proper enum type for all switch() statements
    d9ed32bb27 virTypedParameterAssignValue: Drop 'copystr' parameter
    30403ef1d6 Post-release version bump to 9.4.0

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-extended/libvirt/libvirt-python.inc |   2 +-
 recipes-extended/libvirt/libvirt_9.2.0.bb   | 332 ----------------------------
 recipes-extended/libvirt/libvirt_9.6.0.bb   | 332 ++++++++++++++++++++++++++++
 3 files changed, 333 insertions(+), 333 deletions(-)
 delete mode 100644 recipes-extended/libvirt/libvirt_9.2.0.bb
 create mode 100644 recipes-extended/libvirt/libvirt_9.6.0.bb

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index e4806df0..a8c31e6a 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -20,7 +20,7 @@ INSANE_SKIP:${PN}-dbg += "buildpaths"
 
 SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
 
-SRC_URI[libvirt_python.sha256sum] = "95cc190c57cb84e8ed2e1b8205b01a937e1a4bc19cc8865df19ca4470e6d7c1b"
+SRC_URI[libvirt_python.sha256sum] = "53422d8e3110139655c3d9c2ff2602b238f8a39b7bf61a92a620119b45550a99"
 
 export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
 export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt_9.2.0.bb b/recipes-extended/libvirt/libvirt_9.2.0.bb
deleted file mode 100644
index 5e704704..00000000
--- a/recipes-extended/libvirt/libvirt_9.2.0.bb
+++ /dev/null
@@ -1,332 +0,0 @@
-DESCRIPTION = "A toolkit to interact with the virtualization capabilities of recent versions of Linux." 
-HOMEPAGE = "http://libvirt.org"
-LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
-SECTION = "console/tools"
-
-DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux e2fsprogs pm-utils \
-	   iptables dnsmasq readline libtasn1 libxslt-native acl libdevmapper libtirpc \
-           python3-docutils-native \
-	   ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'shadow-native', '', d)} \
-	   ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls-native', '', d)}"
-
-# libvirt-guests.sh needs gettext.sh
-#
-RDEPENDS:${PN} = "gettext-runtime"
-
-RDEPENDS:libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq netcat-openbsd ebtables"
-RDEPENDS:libvirt-libvirtd:append:x86-64 = " dmidecode"
-RDEPENDS:libvirt-libvirtd:append:x86 = " dmidecode"
-
-#connman blocks the 53 port and libvirtd can't start its DNS service
-RCONFLICTS:${PN}_libvirtd = "connman"
-
-SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
-           file://libvirtd.sh \
-           file://libvirtd.conf \
-           file://dnsmasq.conf \
-           file://hook_support.py \
-           file://gnutls-helper.py \
-           file://0001-prevent-gendispatch.pl-generating-build-path-in-code.patch \
-           file://0001-messon.build-remove-build-path-information-to-avoid-.patch \
-          "
-
-SRC_URI[libvirt.sha256sum] = "a07f501e99093ac1374888312be32182e799de17407ed7547d0e469fae8188c5"
-
-inherit meson gettext update-rc.d pkgconfig systemd useradd perlnative
-USERADD_PACKAGES = "${PN}"
-GROUPADD_PARAM:${PN} = "-r qemu; -r kvm"
-USERADD_PARAM:${PN} = "-r -g qemu -G kvm qemu"
-
-
-EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross"
-do_write_config:append() {
-    cat >${WORKDIR}/meson-${PN}.cross <<EOF
-[binaries]
-iptables = '/usr/sbin/iptables'
-ip6tables = '/usr/sbin/ip6tables'
-dmidecode = '/usr/sbin/dmidecode'
-ebtables = '/sbin/ebtables'
-dnsmasq = '/usr/bin/dnsmasq'
-EOF
-}
-
-ALLOW_EMPTY:${PN} = "1"
-INSANE_SKIP:${PN} += "empty-dirs"
-
-PACKAGES =+ "${PN}-libvirtd ${PN}-virsh"
-
-ALLOW_EMPTY:${PN}-libvirtd = "1"
-
-FILES:${PN}-libvirtd = " \
-	${sysconfdir}/init.d \
-	${sysconfdir}/sysctl.d \
-	${sysconfdir}/logrotate.d \
-	${sysconfdir}/libvirt/libvirtd.conf \
-        /usr/lib/sysctl.d/60-libvirtd.conf \
-	/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf \
-	${sbindir}/libvirtd \
-	${systemd_system_unitdir} \
-	${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
-	${@bb.utils.contains('PACKAGECONFIG', 'gnutls', '${sysconfdir}/pki/libvirt/* ${sysconfdir}/pki/CA/*', '', d)} \
-        "
-
-FILES:${PN}-virsh = " \
-    ${bindir}/virsh \
-    ${datadir}/bash-completion/completions/virsh \
-"
-
-FILES:${PN} += "${libdir}/libvirt/connection-driver \
-	    ${datadir}/augeas \
-	    ${@bb.utils.contains('PACKAGECONFIG', 'polkit', '${datadir}/polkit-1', '', d)} \
-	    ${datadir}/bash-completion/completions/vsh \
-	    ${datadir}/bash-completion/completions/virt-admin \
-	    /usr/lib/firewalld/ \
-	    "
-
-FILES:${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug"
-FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/libvirt/connection-driver/*.a ${libdir}/libvirt/lock-driver/*.a"
-
-CONFFILES:${PN} += "${sysconfdir}/libvirt/libvirt.conf \
-                    ${sysconfdir}/libvirt/lxc.conf \
-                    ${sysconfdir}/libvirt/qemu-lockd.conf \
-                    ${sysconfdir}/libvirt/qemu.conf \
-                    ${sysconfdir}/libvirt/virt-login-shell.conf \
-                    ${sysconfdir}/libvirt/virtlockd.conf"
-
-CONFFILES:${PN}-libvirtd = "${sysconfdir}/logrotate.d/libvirt ${sysconfdir}/logrotate.d/libvirt.lxc \
-                            ${sysconfdir}/logrotate.d/libvirt.qemu ${sysconfdir}/logrotate.d/libvirt.uml \
-                            ${sysconfdir}/libvirt/libvirtd.conf \
-                            /usr/lib/sysctl.d/libvirtd.conf"
-
-INITSCRIPT_PACKAGES = "${PN}-libvirtd"
-INITSCRIPT_NAME:${PN}-libvirtd = "libvirtd"
-INITSCRIPT_PARAMS:${PN}-libvirtd = "defaults 72"
-
-SYSTEMD_PACKAGES = "${PN}-libvirtd"
-SYSTEMD_SERVICE:${PN}-libvirtd = " \
-    libvirtd.service \
-    virtlockd.service \
-    libvirt-guests.service \
-    virtlockd.socket \
-    "
-
-# xen-minimal config
-#PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd"
-
-# full config
-PACKAGECONFIG ??= "gnutls qemu yajl openvz vmware vbox esx lxc test remote \
-                   libvirtd netcf udev python fuse firewalld libpcap \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
-                  "
-
-# qemu is NOT compatible with mips64, powerpc and riscv32
-PACKAGECONFIG:remove:mipsarchn32 = "qemu"
-PACKAGECONFIG:remove:mipsarchn64 = "qemu"
-PACKAGECONFIG:remove:powerpc = "qemu"
-PACKAGECONFIG:remove:riscv32 = "qemu"
-
-# numactl is NOT compatible with arm
-PACKAGECONFIG:remove:arm = "numactl"
-PACKAGECONFIG:remove:armeb = "numactl"
-
-# enable,disable,depends,rdepends
-#
-PACKAGECONFIG[gnutls] = ",,,gnutls-bin"
-PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu,"
-PACKAGECONFIG[yajl] = "-Dyajl=enabled,-Dyajl=disabled,yajl,yajl"
-PACKAGECONFIG[libxl] = "-Ddriver_libxl=enabled,-Ddriver_libxl=disabled,xen,"
-PACKAGECONFIG[openvz] = "-Ddriver_openvz=enabled,-Ddriver_openvz=disabled,,"
-PACKAGECONFIG[vmware] = "-Ddriver_vmware=enabled,-Ddriver_vmware=disabled,,"
-PACKAGECONFIG[vbox] = "-Ddriver_vbox=enabled,-Ddriver_vbox=disabled,,"
-PACKAGECONFIG[esx] = "-Ddriver_esx=enabled,-Ddriver_esx=disabled,,"
-PACKAGECONFIG[hyperv] = "-Ddriver_hyperv=enabled,-Ddriver_hyperv=disabled,,"
-PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit,polkit"
-PACKAGECONFIG[lxc] = "-Ddriver_lxc=enabled,-Ddriver_lxc=disabled,lxc,"
-PACKAGECONFIG[test] = "-Ddriver_test=enabled,-Ddriver_test=disabled,,"
-PACKAGECONFIG[remote] = "-Ddriver_remote=enabled,-Ddriver_remote=disabled,,"
-PACKAGECONFIG[libvirtd] = "-Ddriver_libvirtd=enabled,-Ddriver_libvirtd=disabled,,"
-PACKAGECONFIG[netcf] = "-Dnetcf=enabled,-Dnetcf=disabled,netcf,netcf"
-PACKAGECONFIG[dtrace] = "-Ddtrace=enabled,-Ddtrace=disabled,,"
-PACKAGECONFIG[udev] = "-Dudev=enabled -Dpciaccess=enabled,-Dudev=disabled,udev libpciaccess,"
-PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
-PACKAGECONFIG[python] = ",,python3,"
-PACKAGECONFIG[sasl] = "-Dsasl=enabled,-Dsasl=disabled,cyrus-sasl,cyrus-sasl"
-PACKAGECONFIG[numactl] = "-Dnumactl=enabled,-Dnumactl=disabled,numactl,"
-PACKAGECONFIG[fuse] = "-Dfuse=enabled,-Dfuse=disabled,fuse,"
-PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit,"
-PACKAGECONFIG[libcap-ng] = "-Dcapng=enabled,-Dcapng=disabled,libcap-ng,"
-PACKAGECONFIG[wireshark] = "-Dwireshark_dissector=enabled,-Dwireshark_dissector=disabled,wireshark libwsutil,"
-PACKAGECONFIG[apparmor_profiles] = "-Dapparmor_profiles=enabled, -Dapparmor_profiles=disabled,"
-PACKAGECONFIG[firewalld] = "-Dfirewalld=enabled, -Dfirewalld=disabled,"
-PACKAGECONFIG[libpcap] = "-Dlibpcap=enabled, -Dlibpcap=disabled,libpcap,libpcap"
-PACKAGECONFIG[numad] = "-Dnumad=enabled, -Dnumad=disabled,"
-
-# Enable the Python tool support
-require libvirt-python.inc
-
-do_compile() {
-	cd ${B}/src
-	# There may be race condition, but without creating these directories
-	# in the source tree, generation of files fails.
-	for i in access admin logging esx locking rpc hyperv lxc \
-		    remote network storage interface nwfilter node_device \
-		    secret vbox qemu; do
-		mkdir -p $i;
-	done
-
-	cd ${B}
-	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
-	ninja all
-}
-
-do_install:prepend() {
-	# so the install routines can find the libvirt.pc in the source dir
-	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
-}
-
-do_install:append() {
-	install -d ${D}/etc/init.d
-	install -d ${D}/etc/libvirt
-	install -d ${D}/etc/dnsmasq.d
-
-	install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
-	install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
-
-	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
-	    # This will wind up in the libvirtd package, but will NOT be invoked by default.
-	    #
-	    mv ${D}/${libexecdir}/libvirt-guests.sh ${D}/${sysconfdir}/init.d
-	fi
-
-	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
-            if [ "${systemd_system_unitdir}" != "${prefix}/lib/systemd/system" ] ; then
-                # ./src/meson.build:    systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
-                # ./tools/meson.build:    install_dir: prefix / 'lib' / 'systemd' / 'system',
-                mkdir -p ${D}${systemd_system_unitdir}
-                mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_system_unitdir}
-                rmdir ${D}${prefix}/lib/systemd/system ${D}${prefix}/lib/systemd
-            fi
-
-	    # We can't use 'notify' when we don't support 'sd_notify' dbus capabilities.
-	    # Change default LIBVIRTD_ARGS to start libvirtd in the right mode.
-	    sed -i -e 's/Type=notify/Type=forking/' \
-	           -e '/Type=forking/a PIDFile=/run/libvirtd.pid' \
-	           -e 's/\(Environment=LIBVIRTD_ARGS="--timeout 120"\)/#\1\nEnvironment=LIBVIRTD_ARGS="--listen --daemon"/' \
-		   ${D}/${systemd_system_unitdir}/libvirtd.service
-	fi
-
-	# The /run/libvirt directories created by the Makefile are 
-	# wiped out in volatile, we need to create these at boot.
-	rm -rf ${D}/run
-	install -d ${D}${sysconfdir}/default/volatiles
-	echo "d root root 0755 /run/libvirt none" \
-	     > ${D}${sysconfdir}/default/volatiles/99_libvirt
-	echo "d root root 0755 /run/libvirt/lockd none" \
-	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
-	echo "d root root 0755 /run/libvirt/lxc none" \
-	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
-	echo "d root root 0755 /run/libvirt/network none" \
-	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
-	echo "d root root 0755 /run/libvirt/qemu none" \
-	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
-
-	# Manually set permissions and ownership to match polkit recipe
-	if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
-		install -d -m 0700 ${D}/${datadir}/polkit-1/rules.d
-		chown polkitd ${D}/${datadir}/polkit-1/rules.d
-		chgrp root ${D}/${datadir}/polkit-1/rules.d
-	else
-		rm -rf ${D}/${datadir}/polkit-1
-	fi
-
-	# disable seccomp_sandbox
-        if [ -e ${D}${sysconfdir}/libvirt/qemu.conf ] ; then
-	   sed -i '/^#seccomp_sandbox = 1/aseccomp_sandbox = 0' \
-	       ${D}${sysconfdir}/libvirt/qemu.conf
-        fi
-
-	# Add hook support for libvirt
-	mkdir -p ${D}/etc/libvirt/hooks
-	for hook in "daemon" "lxc" "network" "qemu"
-	do
-		install -m 0755 ${WORKDIR}/hook_support.py ${D}/etc/libvirt/hooks/${hook}
-	done
-
-	# Force the main dnsmasq instance to bind only to specified interfaces and
-	# to not bind to virbr0. Libvirt will run its own instance on this interface.
-	install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/libvirt-daemon
-
-	# remove .la references to our working diretory
-	for i in `find ${D}${libdir} -type f -name *.la`; do
-	    sed -i -e 's#-L${B}/src/.libs##g' $i
-	done
-
-	sed -i -e 's/^\(unix_sock_group\ =\ \).*/\1"kvm"/' ${D}/etc/libvirt/libvirtd.conf
-	sed -i -e 's/^\(unix_sock_rw_perms\ =\ \).*/\1"0776"/' ${D}/etc/libvirt/libvirtd.conf
-
-	case ${MACHINE_ARCH} in
-		*mips*)
-			break
-			;;
-		*)
-			if ${@bb.utils.contains('PACKAGECONFIG', 'qemu', 'true', 'false', d)}; then
-				chown -R qemu:qemu ${D}/${localstatedir}/lib/libvirt/qemu
-				echo "d qemu qemu 0755 ${localstatedir}/cache/libvirt/qemu none" \
-				    >> ${D}${sysconfdir}/default/volatiles/99_libvirt
-				break
-			fi
-			;;
-	esac
-
-	if ${@bb.utils.contains('PACKAGECONFIG','gnutls','true','false',d)}; then
-	    # Generate sample keys and certificates.
-	    cd ${WORKDIR}
-	    ${WORKDIR}/gnutls-helper.py -y
-
-	    # Deploy all sample keys and certificates of CA, server and client
-	    # to target so that libvirtd is able to boot successfully and local
-	    # connection via 127.0.0.1 is available out of box.
-	    install -d ${D}/etc/pki/CA
-	    install -d ${D}/etc/pki/libvirt/private
-            install -m 0755 ${WORKDIR}/gnutls-helper.py ${D}/${bindir}
-	    install -m 0644 ${WORKDIR}/cakey.pem ${D}/${sysconfdir}/pki/libvirt/private/cakey.pem
-	    install -m 0644 ${WORKDIR}/cacert.pem ${D}/${sysconfdir}/pki/CA/cacert.pem
-	    install -m 0644 ${WORKDIR}/serverkey.pem ${D}/${sysconfdir}/pki/libvirt/private/serverkey.pem
-	    install -m 0644 ${WORKDIR}/servercert.pem ${D}/${sysconfdir}/pki/libvirt/servercert.pem
-	    install -m 0644 ${WORKDIR}/clientkey.pem ${D}/${sysconfdir}/pki/libvirt/private/clientkey.pem
-	    install -m 0644 ${WORKDIR}/clientcert.pem ${D}/${sysconfdir}/pki/libvirt/clientcert.pem
-
-	    # Force the connection to be tls.
-	    sed -i -e 's/^\(listen_tls\ =\ .*\)/#\1/' -e 's/^\(listen_tcp\ =\ .*\)/#\1/' ${D}/etc/libvirt/libvirtd.conf
-	fi
-
-	# virt-login-shell needs to run with setuid permission
-	chmod 4755 ${D}${bindir}/virt-login-shell
-}
-
-EXTRA_OEMESON += " \
-    -Dinit_script=${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','none', d)} \
-    -Drunstatedir=/run \
-    -Dtests=enabled \
-    "
-
-# gcc9 end up mis-compiling qemuxml2argvtest.o with Og which then
-# crashes on target, so remove -Og and use -O2 as workaround
-SELECTED_OPTIMIZATION:remove:virtclass-multilib-lib32:mipsarch = "-Og"
-SELECTED_OPTIMIZATION:append:virtclass-multilib-lib32:mipsarch = " -O2"
-
-pkg_postinst:${PN}() {
-        if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
-                /etc/init.d/populate-volatile.sh update
-        fi
-        mkdir -m 711 -p $D/data/images
-}
-
-python () {
-    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
-        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
-}
diff --git a/recipes-extended/libvirt/libvirt_9.6.0.bb b/recipes-extended/libvirt/libvirt_9.6.0.bb
new file mode 100644
index 00000000..6c5d3298
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt_9.6.0.bb
@@ -0,0 +1,332 @@
+DESCRIPTION = "A toolkit to interact with the virtualization capabilities of recent versions of Linux." 
+HOMEPAGE = "http://libvirt.org"
+LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LESSER;md5=4b54a1fd55a448865a0b32d41598759d"
+SECTION = "console/tools"
+
+DEPENDS = "bridge-utils gnutls libxml2 lvm2 avahi parted curl libpcap util-linux e2fsprogs pm-utils \
+	   iptables dnsmasq readline libtasn1 libxslt-native acl libdevmapper libtirpc \
+           python3-docutils-native \
+	   ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'shadow-native', '', d)} \
+	   ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls-native', '', d)}"
+
+# libvirt-guests.sh needs gettext.sh
+#
+RDEPENDS:${PN} = "gettext-runtime"
+
+RDEPENDS:libvirt-libvirtd += "bridge-utils iptables pm-utils dnsmasq netcat-openbsd ebtables"
+RDEPENDS:libvirt-libvirtd:append:x86-64 = " dmidecode"
+RDEPENDS:libvirt-libvirtd:append:x86 = " dmidecode"
+
+#connman blocks the 53 port and libvirtd can't start its DNS service
+RCONFLICTS:${PN}_libvirtd = "connman"
+
+SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
+           file://libvirtd.sh \
+           file://libvirtd.conf \
+           file://dnsmasq.conf \
+           file://hook_support.py \
+           file://gnutls-helper.py \
+           file://0001-prevent-gendispatch.pl-generating-build-path-in-code.patch \
+           file://0001-messon.build-remove-build-path-information-to-avoid-.patch \
+          "
+
+SRC_URI[libvirt.sha256sum] = "10f2e52dbb5df90410594a8e36d0e0587d38f11efb64ff32cbec422b93b70c52"
+
+inherit meson gettext update-rc.d pkgconfig systemd useradd perlnative
+USERADD_PACKAGES = "${PN}"
+GROUPADD_PARAM:${PN} = "-r qemu; -r kvm"
+USERADD_PARAM:${PN} = "-r -g qemu -G kvm qemu"
+
+
+EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross"
+do_write_config:append() {
+    cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+iptables = '/usr/sbin/iptables'
+ip6tables = '/usr/sbin/ip6tables'
+dmidecode = '/usr/sbin/dmidecode'
+ebtables = '/sbin/ebtables'
+dnsmasq = '/usr/bin/dnsmasq'
+EOF
+}
+
+ALLOW_EMPTY:${PN} = "1"
+INSANE_SKIP:${PN} += "empty-dirs"
+
+PACKAGES =+ "${PN}-libvirtd ${PN}-virsh"
+
+ALLOW_EMPTY:${PN}-libvirtd = "1"
+
+FILES:${PN}-libvirtd = " \
+	${sysconfdir}/init.d \
+	${sysconfdir}/sysctl.d \
+	${sysconfdir}/logrotate.d \
+	${sysconfdir}/libvirt/libvirtd.conf \
+        /usr/lib/sysctl.d/60-libvirtd.conf \
+	/usr/lib/sysctl.d/60-qemu-postcopy-migration.conf \
+	${sbindir}/libvirtd \
+	${systemd_system_unitdir} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '', '${libexecdir}/libvirt-guests.sh', d)} \
+	${@bb.utils.contains('PACKAGECONFIG', 'gnutls', '${sysconfdir}/pki/libvirt/* ${sysconfdir}/pki/CA/*', '', d)} \
+        "
+
+FILES:${PN}-virsh = " \
+    ${bindir}/virsh \
+    ${datadir}/bash-completion/completions/virsh \
+"
+
+FILES:${PN} += "${libdir}/libvirt/connection-driver \
+	    ${datadir}/augeas \
+	    ${@bb.utils.contains('PACKAGECONFIG', 'polkit', '${datadir}/polkit-1', '', d)} \
+	    ${datadir}/bash-completion/completions/vsh \
+	    ${datadir}/bash-completion/completions/virt-admin \
+	    /usr/lib/firewalld/ \
+	    "
+
+FILES:${PN}-dbg += "${libdir}/libvirt/connection-driver/.debug ${libdir}/libvirt/lock-driver/.debug"
+FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/libvirt/connection-driver/*.a ${libdir}/libvirt/lock-driver/*.a"
+
+CONFFILES:${PN} += "${sysconfdir}/libvirt/libvirt.conf \
+                    ${sysconfdir}/libvirt/lxc.conf \
+                    ${sysconfdir}/libvirt/qemu-lockd.conf \
+                    ${sysconfdir}/libvirt/qemu.conf \
+                    ${sysconfdir}/libvirt/virt-login-shell.conf \
+                    ${sysconfdir}/libvirt/virtlockd.conf"
+
+CONFFILES:${PN}-libvirtd = "${sysconfdir}/logrotate.d/libvirt ${sysconfdir}/logrotate.d/libvirt.lxc \
+                            ${sysconfdir}/logrotate.d/libvirt.qemu ${sysconfdir}/logrotate.d/libvirt.uml \
+                            ${sysconfdir}/libvirt/libvirtd.conf \
+                            /usr/lib/sysctl.d/libvirtd.conf"
+
+INITSCRIPT_PACKAGES = "${PN}-libvirtd"
+INITSCRIPT_NAME:${PN}-libvirtd = "libvirtd"
+INITSCRIPT_PARAMS:${PN}-libvirtd = "defaults 72"
+
+SYSTEMD_PACKAGES = "${PN}-libvirtd"
+SYSTEMD_SERVICE:${PN}-libvirtd = " \
+    libvirtd.service \
+    virtlockd.service \
+    libvirt-guests.service \
+    virtlockd.socket \
+    "
+
+# xen-minimal config
+#PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd"
+
+# full config
+PACKAGECONFIG ??= "gnutls qemu yajl openvz vmware vbox esx lxc test remote \
+                   libvirtd netcf udev python fuse firewalld libpcap \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
+                  "
+
+# qemu is NOT compatible with mips64, powerpc and riscv32
+PACKAGECONFIG:remove:mipsarchn32 = "qemu"
+PACKAGECONFIG:remove:mipsarchn64 = "qemu"
+PACKAGECONFIG:remove:powerpc = "qemu"
+PACKAGECONFIG:remove:riscv32 = "qemu"
+
+# numactl is NOT compatible with arm
+PACKAGECONFIG:remove:arm = "numactl"
+PACKAGECONFIG:remove:armeb = "numactl"
+
+# enable,disable,depends,rdepends
+#
+PACKAGECONFIG[gnutls] = ",,,gnutls-bin"
+PACKAGECONFIG[qemu] = "-Ddriver_qemu=enabled -Dqemu_user=qemu -Dqemu_group=qemu,-Ddriver_qemu=disabled,qemu,"
+PACKAGECONFIG[yajl] = "-Dyajl=enabled,-Dyajl=disabled,yajl,yajl"
+PACKAGECONFIG[libxl] = "-Ddriver_libxl=enabled,-Ddriver_libxl=disabled,xen,"
+PACKAGECONFIG[openvz] = "-Ddriver_openvz=enabled,-Ddriver_openvz=disabled,,"
+PACKAGECONFIG[vmware] = "-Ddriver_vmware=enabled,-Ddriver_vmware=disabled,,"
+PACKAGECONFIG[vbox] = "-Ddriver_vbox=enabled,-Ddriver_vbox=disabled,,"
+PACKAGECONFIG[esx] = "-Ddriver_esx=enabled,-Ddriver_esx=disabled,,"
+PACKAGECONFIG[hyperv] = "-Ddriver_hyperv=enabled,-Ddriver_hyperv=disabled,,"
+PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit,polkit"
+PACKAGECONFIG[lxc] = "-Ddriver_lxc=enabled,-Ddriver_lxc=disabled,lxc,"
+PACKAGECONFIG[test] = "-Ddriver_test=enabled,-Ddriver_test=disabled,,"
+PACKAGECONFIG[remote] = "-Ddriver_remote=enabled,-Ddriver_remote=disabled,,"
+PACKAGECONFIG[libvirtd] = "-Ddriver_libvirtd=enabled,-Ddriver_libvirtd=disabled,,"
+PACKAGECONFIG[netcf] = "-Dnetcf=enabled,-Dnetcf=disabled,netcf,netcf"
+PACKAGECONFIG[dtrace] = "-Ddtrace=enabled,-Ddtrace=disabled,,"
+PACKAGECONFIG[udev] = "-Dudev=enabled -Dpciaccess=enabled,-Dudev=disabled,udev libpciaccess,"
+PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
+PACKAGECONFIG[python] = ",,python3,"
+PACKAGECONFIG[sasl] = "-Dsasl=enabled,-Dsasl=disabled,cyrus-sasl,cyrus-sasl"
+PACKAGECONFIG[numactl] = "-Dnumactl=enabled,-Dnumactl=disabled,numactl,"
+PACKAGECONFIG[fuse] = "-Dfuse=enabled,-Dfuse=disabled,fuse,"
+PACKAGECONFIG[audit] = "-Daudit=enabled,-Daudit=disabled,audit,"
+PACKAGECONFIG[libcap-ng] = "-Dcapng=enabled,-Dcapng=disabled,libcap-ng,"
+PACKAGECONFIG[wireshark] = "-Dwireshark_dissector=enabled,-Dwireshark_dissector=disabled,wireshark libwsutil,"
+PACKAGECONFIG[apparmor_profiles] = "-Dapparmor_profiles=enabled, -Dapparmor_profiles=disabled,"
+PACKAGECONFIG[firewalld] = "-Dfirewalld=enabled, -Dfirewalld=disabled,"
+PACKAGECONFIG[libpcap] = "-Dlibpcap=enabled, -Dlibpcap=disabled,libpcap,libpcap"
+PACKAGECONFIG[numad] = "-Dnumad=enabled, -Dnumad=disabled,"
+
+# Enable the Python tool support
+require libvirt-python.inc
+
+do_compile() {
+	cd ${B}/src
+	# There may be race condition, but without creating these directories
+	# in the source tree, generation of files fails.
+	for i in access admin logging esx locking rpc hyperv lxc \
+		    remote network storage interface nwfilter node_device \
+		    secret vbox qemu; do
+		mkdir -p $i;
+	done
+
+	cd ${B}
+	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
+	ninja all
+}
+
+do_install:prepend() {
+	# so the install routines can find the libvirt.pc in the source dir
+	export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${B}/src:"
+}
+
+do_install:append() {
+	install -d ${D}/etc/init.d
+	install -d ${D}/etc/libvirt
+	install -d ${D}/etc/dnsmasq.d
+
+	install -m 0755 ${WORKDIR}/libvirtd.sh ${D}/etc/init.d/libvirtd
+	install -m 0644 ${WORKDIR}/libvirtd.conf ${D}/etc/libvirt/libvirtd.conf
+
+	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+	    # This will wind up in the libvirtd package, but will NOT be invoked by default.
+	    #
+	    mv ${D}/${libexecdir}/libvirt-guests.sh ${D}/${sysconfdir}/init.d
+	fi
+
+	if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+            if [ "${systemd_system_unitdir}" != "${prefix}/lib/systemd/system" ] ; then
+                # ./src/meson.build:    systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
+                # ./tools/meson.build:    install_dir: prefix / 'lib' / 'systemd' / 'system',
+                mkdir -p ${D}${systemd_system_unitdir}
+                mv ${D}${prefix}/lib/systemd/system/* ${D}${systemd_system_unitdir}
+                rmdir ${D}${prefix}/lib/systemd/system ${D}${prefix}/lib/systemd
+            fi
+
+	    # We can't use 'notify' when we don't support 'sd_notify' dbus capabilities.
+	    # Change default LIBVIRTD_ARGS to start libvirtd in the right mode.
+	    sed -i -e 's/Type=notify/Type=forking/' \
+	           -e '/Type=forking/a PIDFile=/run/libvirtd.pid' \
+	           -e 's/\(Environment=LIBVIRTD_ARGS="--timeout 120"\)/#\1\nEnvironment=LIBVIRTD_ARGS="--listen --daemon"/' \
+		   ${D}/${systemd_system_unitdir}/libvirtd.service
+	fi
+
+	# The /run/libvirt directories created by the Makefile are 
+	# wiped out in volatile, we need to create these at boot.
+	rm -rf ${D}/run
+	install -d ${D}${sysconfdir}/default/volatiles
+	echo "d root root 0755 /run/libvirt none" \
+	     > ${D}${sysconfdir}/default/volatiles/99_libvirt
+	echo "d root root 0755 /run/libvirt/lockd none" \
+	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
+	echo "d root root 0755 /run/libvirt/lxc none" \
+	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
+	echo "d root root 0755 /run/libvirt/network none" \
+	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
+	echo "d root root 0755 /run/libvirt/qemu none" \
+	     >> ${D}${sysconfdir}/default/volatiles/99_libvirt
+
+	# Manually set permissions and ownership to match polkit recipe
+	if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
+		install -d -m 0700 ${D}/${datadir}/polkit-1/rules.d
+		chown polkitd ${D}/${datadir}/polkit-1/rules.d
+		chgrp root ${D}/${datadir}/polkit-1/rules.d
+	else
+		rm -rf ${D}/${datadir}/polkit-1
+	fi
+
+	# disable seccomp_sandbox
+        if [ -e ${D}${sysconfdir}/libvirt/qemu.conf ] ; then
+	   sed -i '/^#seccomp_sandbox = 1/aseccomp_sandbox = 0' \
+	       ${D}${sysconfdir}/libvirt/qemu.conf
+        fi
+
+	# Add hook support for libvirt
+	mkdir -p ${D}/etc/libvirt/hooks
+	for hook in "daemon" "lxc" "network" "qemu"
+	do
+		install -m 0755 ${WORKDIR}/hook_support.py ${D}/etc/libvirt/hooks/${hook}
+	done
+
+	# Force the main dnsmasq instance to bind only to specified interfaces and
+	# to not bind to virbr0. Libvirt will run its own instance on this interface.
+	install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/libvirt-daemon
+
+	# remove .la references to our working diretory
+	for i in `find ${D}${libdir} -type f -name *.la`; do
+	    sed -i -e 's#-L${B}/src/.libs##g' $i
+	done
+
+	sed -i -e 's/^\(unix_sock_group\ =\ \).*/\1"kvm"/' ${D}/etc/libvirt/libvirtd.conf
+	sed -i -e 's/^\(unix_sock_rw_perms\ =\ \).*/\1"0776"/' ${D}/etc/libvirt/libvirtd.conf
+
+	case ${MACHINE_ARCH} in
+		*mips*)
+			break
+			;;
+		*)
+			if ${@bb.utils.contains('PACKAGECONFIG', 'qemu', 'true', 'false', d)}; then
+				chown -R qemu:qemu ${D}/${localstatedir}/lib/libvirt/qemu
+				echo "d qemu qemu 0755 ${localstatedir}/cache/libvirt/qemu none" \
+				    >> ${D}${sysconfdir}/default/volatiles/99_libvirt
+				break
+			fi
+			;;
+	esac
+
+	if ${@bb.utils.contains('PACKAGECONFIG','gnutls','true','false',d)}; then
+	    # Generate sample keys and certificates.
+	    cd ${WORKDIR}
+	    ${WORKDIR}/gnutls-helper.py -y
+
+	    # Deploy all sample keys and certificates of CA, server and client
+	    # to target so that libvirtd is able to boot successfully and local
+	    # connection via 127.0.0.1 is available out of box.
+	    install -d ${D}/etc/pki/CA
+	    install -d ${D}/etc/pki/libvirt/private
+            install -m 0755 ${WORKDIR}/gnutls-helper.py ${D}/${bindir}
+	    install -m 0644 ${WORKDIR}/cakey.pem ${D}/${sysconfdir}/pki/libvirt/private/cakey.pem
+	    install -m 0644 ${WORKDIR}/cacert.pem ${D}/${sysconfdir}/pki/CA/cacert.pem
+	    install -m 0644 ${WORKDIR}/serverkey.pem ${D}/${sysconfdir}/pki/libvirt/private/serverkey.pem
+	    install -m 0644 ${WORKDIR}/servercert.pem ${D}/${sysconfdir}/pki/libvirt/servercert.pem
+	    install -m 0644 ${WORKDIR}/clientkey.pem ${D}/${sysconfdir}/pki/libvirt/private/clientkey.pem
+	    install -m 0644 ${WORKDIR}/clientcert.pem ${D}/${sysconfdir}/pki/libvirt/clientcert.pem
+
+	    # Force the connection to be tls.
+	    sed -i -e 's/^\(listen_tls\ =\ .*\)/#\1/' -e 's/^\(listen_tcp\ =\ .*\)/#\1/' ${D}/etc/libvirt/libvirtd.conf
+	fi
+
+	# virt-login-shell needs to run with setuid permission
+	chmod 4755 ${D}${bindir}/virt-login-shell
+}
+
+EXTRA_OEMESON += " \
+    -Dinit_script=${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','none', d)} \
+    -Drunstatedir=/run \
+    -Dtests=enabled \
+    "
+
+# gcc9 end up mis-compiling qemuxml2argvtest.o with Og which then
+# crashes on target, so remove -Og and use -O2 as workaround
+SELECTED_OPTIMIZATION:remove:virtclass-multilib-lib32:mipsarch = "-Og"
+SELECTED_OPTIMIZATION:append:virtclass-multilib-lib32:mipsarch = " -O2"
+
+pkg_postinst:${PN}() {
+        if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
+                /etc/init.d/populate-volatile.sh update
+        fi
+        mkdir -m 711 -p $D/data/images
+}
+
+python () {
+    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
+        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
+}
-- 
cgit v1.2.3-54-g00ecf