diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c66d246..294330f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,5 @@
 include:
-- file: /r4.1/gitlab-base.yml
+- file: /r4.3/gitlab-base.yml
   project: QubesOS/qubes-continuous-integration
-- file: /r4.1/gitlab-dom0.yml
-  project: QubesOS/qubes-continuous-integration
-- file: /r4.2/gitlab-base.yml
-  project: QubesOS/qubes-continuous-integration
-- file: /r4.2/gitlab-host.yml
+- file: /r4.3/gitlab-host.yml
   project: QubesOS/qubes-continuous-integration
diff --git a/.qubesbuilder b/.qubesbuilder
index 0a9d852..893c046 100644
--- a/.qubesbuilder
+++ b/.qubesbuilder
@@ -5,11 +5,11 @@ host:
     - libvirt-python.spec
 source:
   files:
-  - url: https://libvirt.org/sources/libvirt-@VERSION@.tar.xz
-    signature: https://libvirt.org/sources/libvirt-@VERSION@.tar.xz.asc
+  - url: https://download.libvirt.org/libvirt-@VERSION@.tar.xz
+    signature: https://download.libvirt.org/libvirt-@VERSION@.tar.xz.asc
     pubkeys: &id001
     - redhat-jiri-denemark-key.asc
     - redhat-veillard-key.asc
-  - url: https://libvirt.org/sources/python/libvirt-python-@VERSION@.tar.gz
-    signature: https://libvirt.org/sources/python/libvirt-python-@VERSION@.tar.gz.asc
+  - url: https://download.libvirt.org/python/libvirt-python-@VERSION@.tar.gz
+    signature: https://download.libvirt.org/python/libvirt-python-@VERSION@.tar.gz.asc
     pubkeys: *id001
diff --git a/0001-conf-add-script-attribute-to-disk-specification.patch b/0001-conf-add-script-attribute-to-disk-specification.patch
index 75eacf8..0dbcd1e 100644
--- a/0001-conf-add-script-attribute-to-disk-specification.patch
+++ b/0001-conf-add-script-attribute-to-disk-specification.patch
@@ -1,4 +1,4 @@
-From 8a2678d184a2a888a12a34370a255d69785a3779 Mon Sep 17 00:00:00 2001
+From 3afc6d4ba5838cf6cd2a31032442491401989094 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Fri, 5 Apr 2013 01:37:29 +0200
 Subject: [PATCH] conf: add 'script' attribute to disk specification
@@ -24,18 +24,18 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  3 files changed, 12 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 7dba65cfeb..93b411b96b 100644
+index cb1154b23f..bcc5e17204 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -2287,6 +2287,7 @@ virDomainDiskDefFree(virDomainDiskDef *def)
+@@ -2392,6 +2392,7 @@ virDomainDiskDefFree(virDomainDiskDef *def)
      g_free(def->domain_name);
      g_free(def->blkdeviotune.group_name);
      g_free(def->virtio);
 +    g_free(def->script);
      virDomainDeviceInfoClear(&def->info);
      virObjectUnref(def->privateData);
- 
-@@ -7927,6 +7928,7 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt,
+     g_slist_free_full(def->iothreads, (GDestroyNotify) virDomainDiskIothreadDefFree);
+@@ -8194,6 +8195,7 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt,
          return NULL;
  
      def->domain_name = virXPathString("string(./backenddomain/@name)", ctxt);
@@ -43,7 +43,7 @@ index 7dba65cfeb..93b411b96b 100644
      def->serial = virXPathString("string(./serial)", ctxt);
      def->wwn = virXPathString("string(./wwn)", ctxt);
      def->vendor = virXPathString("string(./vendor)", ctxt);
-@@ -22332,6 +22334,7 @@ virDomainDiskDefFormat(virBuffer *buf,
+@@ -23016,6 +23018,7 @@ virDomainDiskDefFormat(virBuffer *buf,
          return -1;
  
      virBufferEscapeString(&childBuf, "<backenddomain name='%s'/>\n", def->domain_name);
@@ -52,10 +52,10 @@ index 7dba65cfeb..93b411b96b 100644
      virDomainDiskGeometryDefFormat(&childBuf, def);
      virDomainDiskBlockIoDefFormat(&childBuf, def);
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 8f8a54bc41..1d54075de3 100644
+index 2818a9f1f5..8f1245f202 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -622,6 +622,7 @@ struct _virDomainDiskDef {
+@@ -580,6 +580,7 @@ struct _virDomainDiskDef {
      unsigned int queue_size;
      virDomainDiskModel model;
      virDomainVirtioOptions *virtio;
@@ -64,10 +64,10 @@ index 8f8a54bc41..1d54075de3 100644
      bool diskElementAuth;
      bool diskElementEnc;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index d346442510..bdc0d4ff6d 100644
+index 844a931deb..faaf69bdee 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -1518,6 +1518,14 @@
+@@ -1601,6 +1601,14 @@
            <empty/>
          </element>
        </optional>
@@ -83,5 +83,5 @@ index d346442510..bdc0d4ff6d 100644
          <element name="readonly">
            <empty/>
 -- 
-2.37.3
+2.45.2
 
diff --git a/0002-libxl-use-disk-script-attribute.patch b/0002-libxl-use-disk-script-attribute.patch
index f9c8f5f..3152830 100644
--- a/0002-libxl-use-disk-script-attribute.patch
+++ b/0002-libxl-use-disk-script-attribute.patch
@@ -1,4 +1,4 @@
-From 84dc98be7c2821804cb5234e8e8827ff1407a1c6 Mon Sep 17 00:00:00 2001
+From afa10e786e8ebb608c39770637edf00a8a96a4d5 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Fri, 5 Apr 2013 01:41:04 +0200
 Subject: [PATCH] libxl: use disk 'script' attribute
@@ -18,10 +18,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 918303c8d0..134af3e767 100644
+index 62e1be6672..6cdbd9698a 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -1080,6 +1080,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
+@@ -1092,6 +1092,8 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
  
      x_disk->vdev = g_strdup(l_disk->dst);
  
@@ -31,5 +31,5 @@ index 918303c8d0..134af3e767 100644
          if (STREQ(driver, "tap") || STREQ(driver, "tap2")) {
              switch (format) {
 -- 
-2.37.3
+2.45.2
 
diff --git a/0003-libxl-Stubdom-emulator-type.patch b/0003-libxl-Stubdom-emulator-type.patch
index 69335b7..ceb5f5e 100644
--- a/0003-libxl-Stubdom-emulator-type.patch
+++ b/0003-libxl-Stubdom-emulator-type.patch
@@ -1,4 +1,4 @@
-From 5d9fe9014e15a0abcbf645558253aad113cfb166 Mon Sep 17 00:00:00 2001
+From dded131cf0ffd4f7206f6d45a5494857a6dc15b8 Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Sun, 7 Apr 2013 19:48:52 +0200
 Subject: [PATCH] libxl: Stubdom emulator type
@@ -17,14 +17,14 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  src/conf/domain_conf.c            | 42 +++++++++++++++++++++++++++++--
  src/conf/domain_conf.h            | 10 ++++++++
  src/conf/schemas/domaincommon.rng | 28 ++++++++++++++++++++-
- src/libxl/libxl_conf.c            | 18 +++++++++++++
- 5 files changed, 109 insertions(+), 3 deletions(-)
+ src/libxl/libxl_conf.c            | 19 ++++++++++++++
+ 5 files changed, 110 insertions(+), 3 deletions(-)
 
 diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index e28b805009..4deb290433 100644
+index 5c09b87d2b..1629b84407 100644
 --- a/docs/formatdomain.rst
 +++ b/docs/formatdomain.rst
-@@ -2405,6 +2405,20 @@ guest domain. All devices occur as children of the main ``devices`` element.
+@@ -2475,6 +2475,20 @@ guest domain. All devices occur as children of the main ``devices`` element.
     specifies the recommended default emulator to use for each particular domain
     type / architecture combination.
  
@@ -46,10 +46,10 @@ index e28b805009..4deb290433 100644
  child ``alias`` element which then has ``name`` attribute where users can store
  identifier for the device. The identifier has to have "ua-" prefix and must be
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 93b411b96b..ae258b51d6 100644
+index bcc5e17204..c41bb3492e 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -1253,6 +1253,11 @@ VIR_ENUM_IMPL(virDomainDiskTray,
+@@ -1281,6 +1281,11 @@ VIR_ENUM_IMPL(virDomainDiskTray,
                "open",
  );
  
@@ -61,7 +61,7 @@ index 93b411b96b..ae258b51d6 100644
  VIR_ENUM_IMPL(virDomainRNGModel,
                VIR_DOMAIN_RNG_MODEL_LAST,
                "virtio",
-@@ -3797,6 +3802,7 @@ void virDomainDefFree(virDomainDef *def)
+@@ -4007,6 +4012,7 @@ void virDomainDefFree(virDomainDef *def)
      g_free(def->name);
      virBitmapFree(def->cpumask);
      g_free(def->emulator);
@@ -69,7 +69,7 @@ index 93b411b96b..ae258b51d6 100644
      g_free(def->description);
      g_free(def->title);
      g_free(def->kvm_features);
-@@ -18337,6 +18343,17 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
+@@ -18933,6 +18939,17 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
      if (virDomainDefParseBootOptions(def, ctxt, xmlopt, flags) < 0)
          return NULL;
  
@@ -79,7 +79,7 @@ index 93b411b96b..ae258b51d6 100644
 +        g_free(tmp);
 +        if (def->emulator_type < 0) {
 +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                           _("Unknown emulator type '%s'"), tmp);
++                           _("Unknown emulator type '%1$s'"), tmp);
 +        }
 +    }
 +    def->emulator_cmdline = virXPathString("string(./devices/emulator/@cmdline)", ctxt);
@@ -87,13 +87,13 @@ index 93b411b96b..ae258b51d6 100644
      /* analysis of the disk devices */
      if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0)
          return NULL;
-@@ -20875,6 +20892,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src,
+@@ -21514,6 +21531,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src,
          goto error;
      }
  
 +    if (src->emulator_type != dst->emulator_type) {
 +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                _("Target domain emulator type %s does not match source %s"),
++                _("Target domain emulator type %1$s does not match source %2$s"),
 +                virDomainEmulatorTypeTypeToString(dst->emulator_type),
 +                virDomainEmulatorTypeTypeToString(src->emulator_type));
 +        goto error;
@@ -102,7 +102,7 @@ index 93b411b96b..ae258b51d6 100644
      if (!virDomainDefFeaturesCheckABIStability(src, dst))
          goto error;
  
-@@ -27128,8 +27153,21 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
+@@ -28142,8 +28167,21 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
      virBufferAddLit(buf, "<devices>\n");
      virBufferAdjustIndent(buf, 2);
  
@@ -127,10 +127,10 @@ index 93b411b96b..ae258b51d6 100644
      for (n = 0; n < def->ndisks; n++)
          if (virDomainDiskDefFormat(buf, def->disks[n], flags, xmlopt) < 0)
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 1d54075de3..1de6504859 100644
+index 8f1245f202..d149eae979 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -2546,6 +2546,13 @@ struct _virBlkioDevice {
+@@ -2597,6 +2597,13 @@ struct _virBlkioDevice {
      unsigned long long wbps;
  };
  
@@ -144,7 +144,7 @@ index 1d54075de3..1de6504859 100644
  typedef enum {
      VIR_DOMAIN_RNG_MODEL_VIRTIO,
      VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL,
-@@ -2918,6 +2925,8 @@ struct _virDomainDef {
+@@ -3043,6 +3050,8 @@ struct _virDomainDef {
  
      virDomainOSDef os;
      char *emulator;
@@ -153,7 +153,7 @@ index 1d54075de3..1de6504859 100644
      /* Most {caps_,hyperv_,kvm_,}feature options utilize a virTristateSwitch
       * to handle support. A few assign specific data values to the option.
       * See virDomainDefFeaturesCheckABIStability() for details. */
-@@ -4064,6 +4073,7 @@ VIR_ENUM_DECL(virDomainHyperv);
+@@ -4247,6 +4256,7 @@ VIR_ENUM_DECL(virDomainHyperv);
  VIR_ENUM_DECL(virDomainKVM);
  VIR_ENUM_DECL(virDomainXen);
  VIR_ENUM_DECL(virDomainXenPassthroughMode);
@@ -162,10 +162,10 @@ index 1d54075de3..1de6504859 100644
  VIR_ENUM_DECL(virDomainRNGModel);
  VIR_ENUM_DECL(virDomainRNGBackend);
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index bdc0d4ff6d..bca958c55a 100644
+index faaf69bdee..69cdb2e8c8 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -3863,7 +3863,33 @@
+@@ -4135,7 +4135,33 @@
      -->
    <define name="emulator">
      <element name="emulator">
@@ -201,10 +201,10 @@ index bdc0d4ff6d..bca958c55a 100644
    </define>
    <!--
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 134af3e767..5699dfe180 100644
+index 6cdbd9698a..3221b8f0d9 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -669,6 +669,24 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -686,6 +686,25 @@ libxlMakeDomBuildInfo(virDomainDef *def,
              b_info->device_model_version = libxlDomainGetEmulatorType(def);
          }
  
@@ -221,7 +221,8 @@ index 134af3e767..5699dfe180 100644
 +            b_info->extra_hvm = g_strsplit(def->emulator_cmdline, " ", 0);
 +            if (b_info->extra_hvm == NULL) {
 +                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Failed to parse emulator cmdline"));
++                               _("Failed to parse emulator cmdline '%1$s'"),
++                               def->emulator_cmdline);
 +                return -1;
 +            }
 +        }
@@ -230,5 +231,5 @@ index 134af3e767..5699dfe180 100644
              if (def->nserials == 1) {
                  if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) <
 -- 
-2.37.3
+2.45.2
 
diff --git a/0004-libxl-support-domain-config-modification-in-virDomai.patch b/0004-libxl-support-domain-config-modification-in-virDomai.patch
index 10111e2..1261ec4 100644
--- a/0004-libxl-support-domain-config-modification-in-virDomai.patch
+++ b/0004-libxl-support-domain-config-modification-in-virDomai.patch
@@ -1,4 +1,4 @@
-From ffa8e149189944eee6ef489c3d52f702789eeccb Mon Sep 17 00:00:00 2001
+From aa2d0b1e9bbeb616bd3e725a39cd4b8dbb6ab8fa Mon Sep 17 00:00:00 2001
 From: Marek Marczykowski <marmarek@invisiblethingslab.com>
 Date: Sun, 14 Apr 2013 04:28:00 +0200
 Subject: [PATCH] libxl: support domain config modification in
@@ -13,10 +13,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 1b8b40e9e0..3e99ed7212 100644
+index 7dcae58413..2feaefc00c 100644
 --- a/src/libxl/libxl_driver.c
 +++ b/src/libxl/libxl_driver.c
-@@ -1948,11 +1948,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
+@@ -1947,11 +1947,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
  #endif
  
      virCheckFlags(VIR_DOMAIN_SAVE_PAUSED, -1);
@@ -28,7 +28,7 @@ index 1b8b40e9e0..3e99ed7212 100644
  
      fd = libxlDomainSaveImageOpen(driver, from, &def, &hdr);
      if (fd < 0)
-@@ -1961,6 +1956,18 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
+@@ -1960,6 +1955,18 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
      if (virDomainRestoreFlagsEnsureACL(conn, def) < 0)
          goto cleanup;
  
@@ -48,5 +48,5 @@ index 1b8b40e9e0..3e99ed7212 100644
                                     driver->xmlopt,
                                     VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
 -- 
-2.37.3
+2.45.2
 
diff --git a/0005-Add-nostrictreset-attribute-to-PCI-host-devices.patch b/0005-Add-nostrictreset-attribute-to-PCI-host-devices.patch
index 9cf8c05..44f3792 100644
--- a/0005-Add-nostrictreset-attribute-to-PCI-host-devices.patch
+++ b/0005-Add-nostrictreset-attribute-to-PCI-host-devices.patch
@@ -1,4 +1,4 @@
-From 264f321508b5efde63323cf4ad449d487c66a33b Mon Sep 17 00:00:00 2001
+From 38b6bf3ec3d7df7c1dcfedf8b648cb72f7c6859c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Sat, 23 May 2015 04:25:01 +0200
@@ -20,28 +20,28 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  src/conf/domain_conf.h            |  1 +
  src/conf/schemas/domaincommon.rng |  5 +++++
  src/hypervisor/virhostdev.c       |  2 ++
- src/util/virpci.c                 | 19 ++++++++++++++++++-
+ src/util/virpci.c                 | 18 ++++++++++++++++++
  src/util/virpci.h                 |  2 ++
- 7 files changed, 42 insertions(+), 1 deletion(-)
+ 7 files changed, 42 insertions(+)
 
 diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
-index 4deb290433..f040059172 100644
+index 1629b84407..582571e4e8 100644
 --- a/docs/formatdomain.rst
 +++ b/docs/formatdomain.rst
-@@ -4216,6 +4216,8 @@ or:
-       starting the guest or hot-plugging the device and
-       ``virNodeDeviceReAttach`` (or ``virsh nodedev-reattach``) after hot-unplug
-       or stopping the guest.
+@@ -4424,6 +4424,8 @@ or:
+       to the guest. This framebuffer allows the vgpu to be used as a boot display
+       before the gpu driver is loaded within the guest. ``ramfb`` requires the
+       ``display`` attribute to be set to ``on``.
 +      Additionally when ``strictreset`` is ``no``, device will be assigned to
 +      the domain, even when reset fails. The default is ``yes``.
     ``scsi``
        For SCSI devices, user is responsible to make sure the device is not used
        by host. If supported by the hypervisor and OS, the optional ``sgio`` (
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index ae258b51d6..502a3c87ac 100644
+index c41bb3492e..a5459c9ae9 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -6021,6 +6021,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
+@@ -6226,6 +6226,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
      virDomainHostdevSubsysSCSIVHost *scsihostsrc = &def->source.subsys.u.scsi_host;
      virDomainHostdevSubsysMediatedDev *mdevsrc = &def->source.subsys.u.mdev;
      virTristateBool managed;
@@ -49,7 +49,7 @@ index ae258b51d6..502a3c87ac 100644
      g_autofree char *model = NULL;
      int rv;
  
-@@ -6033,6 +6034,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
+@@ -6238,6 +6239,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                                          VIR_XML_PROP_NONE, &managed));
      virTristateBoolToBool(managed, &def->managed);
  
@@ -61,7 +61,7 @@ index ae258b51d6..502a3c87ac 100644
      model = virXMLPropString(node, "model");
  
      /* @type is passed in from the caller rather than read from the
-@@ -23205,6 +23211,8 @@ virDomainActualNetDefFormat(virBuffer *buf,
+@@ -23906,6 +23912,8 @@ virDomainActualNetDefFormat(virBuffer *buf,
          virDomainHostdevDef *hostdef = virDomainNetGetActualHostdev(def);
          if  (hostdef && hostdef->managed)
              virBufferAddLit(buf, " managed='yes'");
@@ -70,7 +70,7 @@ index ae258b51d6..502a3c87ac 100644
      }
      if (def->trustGuestRxFilters)
          virBufferAsprintf(buf, " trustGuestRxFilters='%s'",
-@@ -23400,6 +23408,8 @@ virDomainNetDefFormat(virBuffer *buf,
+@@ -24200,6 +24208,8 @@ virDomainNetDefFormat(virBuffer *buf,
      virBufferAsprintf(buf, "<interface type='%s'", typeStr);
      if (hostdef && hostdef->managed)
          virBufferAddLit(buf, " managed='yes'");
@@ -79,7 +79,7 @@ index ae258b51d6..502a3c87ac 100644
      if (def->trustGuestRxFilters)
          virBufferAsprintf(buf, " trustGuestRxFilters='%s'",
                            virTristateBoolTypeToString(def->trustGuestRxFilters));
-@@ -25491,6 +25501,8 @@ virDomainHostdevDefFormat(virBuffer *buf,
+@@ -26409,6 +26419,8 @@ virDomainHostdevDefFormat(virBuffer *buf,
      if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
          virBufferAsprintf(buf, " managed='%s'",
                            def->managed ? "yes" : "no");
@@ -89,10 +89,10 @@ index ae258b51d6..502a3c87ac 100644
          if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
              scsisrc->sgio)
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 1de6504859..e70aaeea31 100644
+index d149eae979..f0db176cd1 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -388,6 +388,7 @@ struct _virDomainHostdevDef {
+@@ -368,6 +368,7 @@ struct _virDomainHostdevDef {
      bool readonly;
      bool shareable;
      virTristateBool writeFiltering;
@@ -101,10 +101,10 @@ index 1de6504859..e70aaeea31 100644
          virDomainHostdevSubsys subsys;
          virDomainHostdevCaps caps;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index bca958c55a..af2f9a86e4 100644
+index 69cdb2e8c8..583b0421dc 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -3402,6 +3402,11 @@
+@@ -3618,6 +3618,11 @@
                <ref name="virYesNo"/>
              </attribute>
            </optional>
@@ -117,7 +117,7 @@ index bca958c55a..af2f9a86e4 100644
              <element name="source">
                <optional>
 diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
-index c0ce867596..d8abf0727e 100644
+index 185ec2ca50..03e493ea57 100644
 --- a/src/hypervisor/virhostdev.c
 +++ b/src/hypervisor/virhostdev.c
 @@ -255,6 +255,8 @@ virHostdevGetPCIHostDevice(const virDomainHostdevDef *hostdev,
@@ -130,19 +130,18 @@ index c0ce867596..d8abf0727e 100644
      return 0;
  }
 diff --git a/src/util/virpci.c b/src/util/virpci.c
-index 7800966963..ec7bd6bb2b 100644
+index 289c0b330b..38163699f1 100644
 --- a/src/util/virpci.c
 +++ b/src/util/virpci.c
-@@ -86,7 +86,7 @@ struct _virPCIDevice {
+@@ -91,6 +91,7 @@ struct _virPCIDevice {
      /**/
  
      bool          managed;
--
 +    bool          strictreset;
-     virPCIStubDriver stubDriver;
  
-     /* used by reattach function */
-@@ -1075,6 +1075,9 @@ virPCIDeviceReset(virPCIDevice *dev,
+     virPCIStubDriver stubDriverType;
+     char            *stubDriverName; /* if blank, use default for type */
+@@ -1157,6 +1158,9 @@ virPCIDeviceReset(virPCIDevice *dev,
                         dev->name,
                         err ? err->message :
                         _("no FLR, PM reset or bus reset available"));
@@ -152,7 +151,7 @@ index 7800966963..ec7bd6bb2b 100644
      }
  
   cleanup:
-@@ -1462,6 +1465,8 @@ virPCIDeviceNew(const virPCIDeviceAddress *address)
+@@ -1873,6 +1877,8 @@ virPCIDeviceNew(const virPCIDeviceAddress *address)
  
      virPCIDeviceAddressCopy(&dev->address, address);
  
@@ -161,7 +160,7 @@ index 7800966963..ec7bd6bb2b 100644
      dev->name = virPCIDeviceAddressAsString(&dev->address);
  
      dev->path = g_strdup_printf(PCI_SYSFS "devices/%s/config", dev->name);
-@@ -1574,6 +1579,18 @@ virPCIDeviceGetManaged(virPCIDevice *dev)
+@@ -1987,6 +1993,18 @@ virPCIDeviceGetManaged(virPCIDevice *dev)
      return dev->managed;
  }
  
@@ -178,21 +177,21 @@ index 7800966963..ec7bd6bb2b 100644
 +}
 +
  void
- virPCIDeviceSetStubDriver(virPCIDevice *dev, virPCIStubDriver driver)
+ virPCIDeviceSetStubDriverType(virPCIDevice *dev, virPCIStubDriver driverType)
  {
 diff --git a/src/util/virpci.h b/src/util/virpci.h
-index 4d9193f24e..49350d0940 100644
+index ba5e0ae6f1..c6f5a784f3 100644
 --- a/src/util/virpci.h
 +++ b/src/util/virpci.h
-@@ -137,6 +137,8 @@ bool virPCIDeviceGetManaged(virPCIDevice *dev);
- void virPCIDeviceSetStubDriver(virPCIDevice *dev,
-                                virPCIStubDriver driver);
- virPCIStubDriver virPCIDeviceGetStubDriver(virPCIDevice *dev);
+@@ -135,6 +135,8 @@ virPCIStubDriver virPCIDeviceGetStubDriverType(virPCIDevice *dev);
+ void virPCIDeviceSetStubDriverName(virPCIDevice *dev,
+                                    const char *driverName);
+ const char *virPCIDeviceGetStubDriverName(virPCIDevice *dev);
 +void virPCIDeviceSetStrictReset(virPCIDevice *dev, bool strictreset);
 +unsigned int virPCIDeviceGetStrictReset(virPCIDevice *dev);
  virPCIDeviceAddress *virPCIDeviceGetAddress(virPCIDevice *dev);
  int virPCIDeviceSetUsedBy(virPCIDevice *dev,
                            const char *drv_name,
 -- 
-2.37.3
+2.45.2
 
diff --git a/0006-libxl-pause-also-stubdomain-if-any-while-pausing-a-d.patch b/0006-libxl-pause-also-stubdomain-if-any-while-pausing-a-d.patch
index 44400a2..83055a1 100644
--- a/0006-libxl-pause-also-stubdomain-if-any-while-pausing-a-d.patch
+++ b/0006-libxl-pause-also-stubdomain-if-any-while-pausing-a-d.patch
@@ -1,4 +1,4 @@
-From c7ae3b0eaa021bd7beb1ff7d4d42b9df8e3a9b37 Mon Sep 17 00:00:00 2001
+From c282684f846ee39dfa28084dbcaad33f7c07a46a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 25 Nov 2015 00:48:56 +0100
@@ -16,7 +16,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 30 insertions(+)
 
 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 3e99ed7212..8da16e55d3 100644
+index 2feaefc00c..9c0b8c866c 100644
 --- a/src/libxl/libxl_driver.c
 +++ b/src/libxl/libxl_driver.c
 @@ -1167,6 +1167,15 @@ libxlDomainSuspend(virDomainPtr dom)
@@ -27,14 +27,14 @@ index 3e99ed7212..8da16e55d3 100644
 +        if (stubdom_domid) {
 +            if (libxlDomainPauseWrapper(cfg->ctx, stubdom_domid) != 0) {
 +                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Failed to suspend domain '%d' with libxenlight"),
++                               _("Failed to suspend domain '%1$d' with libxenlight"),
 +                               stubdom_domid);
 +                goto endjob;
 +            }
 +        }
          if (libxlDomainPauseWrapper(cfg->ctx, vm->def->id) != 0) {
              virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Failed to suspend domain '%d' with libxenlight"),
+                            _("Failed to suspend domain '%1$d' with libxenlight"),
 @@ -1203,6 +1212,8 @@ libxlDomainResume(virDomainPtr dom)
      libxlDriverConfig *cfg = libxlDriverConfigGet(driver);
      virDomainObj *vm;
@@ -51,7 +51,7 @@ index 3e99ed7212..8da16e55d3 100644
 +        stubdom_domid = libxl_get_stubdom_id(cfg->ctx, vm->def->id);
          if (libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id) != 0) {
              virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Failed to resume domain '%d' with libxenlight"),
+                            _("Failed to resume domain '%1$d' with libxenlight"),
                             vm->def->id);
              goto endjob;
          }
@@ -62,13 +62,13 @@ index 3e99ed7212..8da16e55d3 100644
 +             */
 +            if (libxl_domain_info(cfg->ctx, &d_info, stubdom_domid) != 0) {
 +                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Failed to get '%d' stubdomain state with libxenlight"),
++                               _("Failed to get '%1$d' stubdomain state with libxenlight"),
 +                               stubdom_domid);
 +                goto endjob;
 +            }
 +            if (d_info.paused && libxlDomainUnpauseWrapper(cfg->ctx, stubdom_domid) != 0) {
 +                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("Failed to resume domain '%d' with libxenlight"),
++                               _("Failed to resume domain '%1$d' with libxenlight"),
 +                               stubdom_domid);
 +                goto endjob;
 +            }
@@ -77,5 +77,5 @@ index 3e99ed7212..8da16e55d3 100644
          virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
                               VIR_DOMAIN_RUNNING_UNPAUSED);
 -- 
-2.37.3
+2.45.2
 
diff --git a/0007-libxl-plug-workaround-for-missing-pcidev-group-assig.patch b/0007-libxl-plug-workaround-for-missing-pcidev-group-assig.patch
index 1dc53d8..f42dcf4 100644
--- a/0007-libxl-plug-workaround-for-missing-pcidev-group-assig.patch
+++ b/0007-libxl-plug-workaround-for-missing-pcidev-group-assig.patch
@@ -1,4 +1,4 @@
-From 7be1b8ef4a654a5fc7e03aa08ea19146c2587cf7 Mon Sep 17 00:00:00 2001
+From b106b295a60a73b987f8c58993e3e84ea1f9a42e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Sat, 28 Nov 2015 18:27:59 +0100
@@ -33,10 +33,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 5699dfe180..b2243eb623 100644
+index 3221b8f0d9..edd8d15b64 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -2281,6 +2281,9 @@ libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev)
+@@ -2284,6 +2284,9 @@ libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev)
      pcidev->dev = pcisrc->addr.slot;
      pcidev->func = pcisrc->addr.function;
      pcidev->permissive = hostdev->writeFiltering == VIR_TRISTATE_BOOL_NO;
@@ -47,5 +47,5 @@ index 5699dfe180..b2243eb623 100644
      return 0;
  }
 -- 
-2.37.3
+2.45.2
 
diff --git a/0008-libxl-add-linux-stubdom-support.patch b/0008-libxl-add-linux-stubdom-support.patch
index d1d860b..b01905a 100644
--- a/0008-libxl-add-linux-stubdom-support.patch
+++ b/0008-libxl-add-linux-stubdom-support.patch
@@ -1,4 +1,4 @@
-From 0312374d0b2e5c1099fcda670da223896f5fd017 Mon Sep 17 00:00:00 2001
+From 774447bb447be312c555681a5ed02314928a6a32 Mon Sep 17 00:00:00 2001
 From: HW42 <hw42@ipsumj.de>
 Date: Sat, 22 Apr 2017 08:56:59 +0200
 Subject: [PATCH] libxl: add linux stubdom support
@@ -15,10 +15,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  4 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 502a3c87ac..2a97af517f 100644
+index a5459c9ae9..093568fd1c 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -1256,7 +1256,8 @@ VIR_ENUM_IMPL(virDomainDiskTray,
+@@ -1284,7 +1284,8 @@ VIR_ENUM_IMPL(virDomainDiskTray,
  VIR_ENUM_IMPL(virDomainEmulatorType,
                VIR_DOMAIN_EMULATOR_TYPE_LAST,
                "qemu",
@@ -29,10 +29,10 @@ index 502a3c87ac..2a97af517f 100644
  VIR_ENUM_IMPL(virDomainRNGModel,
                VIR_DOMAIN_RNG_MODEL_LAST,
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index e70aaeea31..c1ef0f2560 100644
+index f0db176cd1..b1b29df20d 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -2550,6 +2550,7 @@ struct _virBlkioDevice {
+@@ -2601,6 +2601,7 @@ struct _virBlkioDevice {
  typedef enum {
      VIR_DOMAIN_EMULATOR_TYPE_DEFAULT,
      VIR_DOMAIN_EMULATOR_TYPE_STUBDOM,
@@ -41,10 +41,10 @@ index e70aaeea31..c1ef0f2560 100644
      VIR_DOMAIN_EMULATOR_TYPE_LAST
  } virDomainEmulatorType;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index af2f9a86e4..b56e06123a 100644
+index 583b0421dc..684335d6a2 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -3875,6 +3875,7 @@
+@@ -4147,6 +4147,7 @@
                <choice>
                  <value>qemu</value>
                  <value>stubdom</value>
@@ -52,7 +52,7 @@ index af2f9a86e4..b56e06123a 100644
                </choice>
              </attribute>
            </optional>
-@@ -3890,6 +3891,7 @@
+@@ -4162,6 +4163,7 @@
              <choice>
                <value>qemu</value>
                <value>stubdom</value>
@@ -61,10 +61,10 @@ index af2f9a86e4..b56e06123a 100644
            </attribute>
            <empty/>
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index b2243eb623..e636fc6227 100644
+index edd8d15b64..80d17a0b0b 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -667,6 +667,11 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -684,6 +684,11 @@ libxlMakeDomBuildInfo(virDomainDef *def,
              b_info->device_model = g_strdup(def->emulator);
  
              b_info->device_model_version = libxlDomainGetEmulatorType(def);
@@ -76,7 +76,7 @@ index b2243eb623..e636fc6227 100644
          }
  
          /* In case of stubdom there will be two qemu instances:
-@@ -675,7 +680,8 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -692,7 +697,8 @@ libxlMakeDomBuildInfo(virDomainDef *def,
           * Emulator path control only the second one. It makes a perfect sense
           * to use <emulator type='stubdom'/> (yes, without emulator path).
           */
@@ -87,5 +87,5 @@ index b2243eb623..e636fc6227 100644
  
          if (def->emulator_cmdline && def->emulator_cmdline[0]) {
 -- 
-2.37.3
+2.45.2
 
diff --git a/0009-libxl-add-support-for-qubes-graphic-device.patch b/0009-libxl-add-support-for-qubes-graphic-device.patch
index 9c279cb..bdd385f 100644
--- a/0009-libxl-add-support-for-qubes-graphic-device.patch
+++ b/0009-libxl-add-support-for-qubes-graphic-device.patch
@@ -1,4 +1,4 @@
-From 6918553535e73b64b7d3494a79fdbc83e5bd92ed Mon Sep 17 00:00:00 2001
+From d9407161ed3a0e78e27f67ffb3ca99eb605c69d5 Mon Sep 17 00:00:00 2001
 From: HW42 <hw42@ipsumj.de>
 Date: Sat, 22 Apr 2017 08:57:58 +0200
 Subject: [PATCH] libxl: add support for qubes graphic device
@@ -24,10 +24,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  13 files changed, 85 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 2a97af517f..ace4db7023 100644
+index 093568fd1c..befc5e97ff 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -926,6 +926,7 @@ VIR_ENUM_IMPL(virDomainGraphics,
+@@ -952,6 +952,7 @@ VIR_ENUM_IMPL(virDomainGraphics,
                "vnc",
                "rdp",
                "desktop",
@@ -35,7 +35,7 @@ index 2a97af517f..ace4db7023 100644
                "spice",
                "egl-headless",
                "dbus",
-@@ -1909,6 +1910,10 @@ void virDomainGraphicsDefFree(virDomainGraphicsDef *def)
+@@ -2003,6 +2004,10 @@ void virDomainGraphicsDefFree(virDomainGraphicsDef *def)
          g_free(def->data.desktop.display);
          break;
  
@@ -46,7 +46,7 @@ index 2a97af517f..ace4db7023 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
          g_free(def->data.spice.rendernode);
          g_free(def->data.spice.keymap);
-@@ -11116,6 +11121,30 @@ virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDef *def,
+@@ -11531,6 +11536,30 @@ virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDef *def,
      return 0;
  }
  
@@ -60,7 +60,7 @@ index 2a97af517f..ace4db7023 100644
 +        if (virStrToLong_i(log_level, NULL, 10,
 +                           &def->data.qubes_gui.log_level) < 0) {
 +            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse Qubes GUI log_level %s"), log_level);
++                           _("cannot parse Qubes GUI log_level %1$s"), log_level);
 +            goto error;
 +        }
 +    } else {
@@ -77,7 +77,7 @@ index 2a97af517f..ace4db7023 100644
  
  static int
  virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDef *def,
-@@ -11402,6 +11431,10 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *xmlopt,
+@@ -11817,6 +11846,10 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *xmlopt,
          if (virDomainGraphicsDefParseXMLDesktop(def, node) < 0)
              goto error;
          break;
@@ -88,7 +88,7 @@ index 2a97af517f..ace4db7023 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
          if (virDomainGraphicsDefParseXMLSpice(def, node, ctxt, flags) < 0)
              goto error;
-@@ -25240,6 +25273,14 @@ virDomainGraphicsDefFormat(virBuffer *buf,
+@@ -26157,6 +26190,14 @@ virDomainGraphicsDefFormat(virBuffer *buf,
  
          break;
  
@@ -103,7 +103,7 @@ index 2a97af517f..ace4db7023 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
          if (!glisten) {
              virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-@@ -30194,6 +30235,7 @@ virDomainGraphicsDefHasOpenGL(const virDomainDef *def)
+@@ -31048,6 +31089,7 @@ virDomainGraphicsDefHasOpenGL(const virDomainDef *def)
          switch (graphics->type) {
          case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -111,7 +111,7 @@ index 2a97af517f..ace4db7023 100644
          case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
              continue;
          case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-@@ -30255,6 +30297,7 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics)
+@@ -31109,6 +31151,7 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics)
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -120,10 +120,10 @@ index 2a97af517f..ace4db7023 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
          break;
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index c1ef0f2560..e471c08a0a 100644
+index b1b29df20d..44a9a6ab5c 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -1804,6 +1804,7 @@ typedef enum {
+@@ -1850,6 +1850,7 @@ typedef enum {
      VIR_DOMAIN_GRAPHICS_TYPE_VNC,
      VIR_DOMAIN_GRAPHICS_TYPE_RDP,
      VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP,
@@ -131,7 +131,7 @@ index c1ef0f2560..e471c08a0a 100644
      VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
      VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS,
      VIR_DOMAIN_GRAPHICS_TYPE_DBUS,
-@@ -1980,6 +1981,10 @@ struct _virDomainGraphicsDef {
+@@ -2026,6 +2027,10 @@ struct _virDomainGraphicsDef {
              virTristateBool gl;
              char *rendernode;
          } spice;
@@ -143,10 +143,10 @@ index c1ef0f2560..e471c08a0a 100644
              char *rendernode;
          } egl_headless;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index b56e06123a..cbc3b0f49f 100644
+index 684335d6a2..3e21b51dd8 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -4013,6 +4013,19 @@
+@@ -4285,6 +4285,19 @@
              <ref name="listenElements"/>
            </interleave>
          </group>
@@ -167,10 +167,10 @@ index b56e06123a..cbc3b0f49f 100644
            <attribute name="type">
              <value>spice</value>
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index e636fc6227..519de16d8b 100644
+index 80d17a0b0b..40106d901c 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -1570,6 +1570,9 @@ libxlMakeVfb(virPortAllocatorRange *graphicsports,
+@@ -1576,6 +1576,9 @@ libxlMakeVfb(virPortAllocatorRange *graphicsports,
          case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
          case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
              break;
@@ -180,7 +180,7 @@ index e636fc6227..519de16d8b 100644
      }
  
      return 0;
-@@ -1644,6 +1647,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphicsports,
+@@ -1650,6 +1653,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphicsports,
          unsigned short port;
          virDomainGraphicsListenDef *glisten = NULL;
  
@@ -194,10 +194,10 @@ index e636fc6227..519de16d8b 100644
              continue;
  
 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index 2d53250895..ad27c4ef8b 100644
+index 0f129ec69c..1a2487e999 100644
 --- a/src/libxl/libxl_domain.c
 +++ b/src/libxl/libxl_domain.c
-@@ -836,6 +836,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver,
+@@ -876,6 +876,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver,
          case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
          case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -206,7 +206,7 @@ index 2d53250895..ad27c4ef8b 100644
          case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
          case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 8da16e55d3..76fd07ada0 100644
+index 9c0b8c866c..6aac88d940 100644
 --- a/src/libxl/libxl_driver.c
 +++ b/src/libxl/libxl_driver.c
 @@ -461,6 +461,7 @@ libxlReconnectDomain(virDomainObj *vm,
@@ -218,10 +218,10 @@ index 8da16e55d3..76fd07ada0 100644
           case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
           case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 57164b7ae6..b557c445f8 100644
+index 6ec1e9cbef..b02b09a825 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -8054,6 +8054,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg,
+@@ -8560,6 +8560,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg,
              break;
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
          case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -229,7 +229,7 @@ index 57164b7ae6..b557c445f8 100644
              return -1;
          case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
          default:
-@@ -9629,6 +9630,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver,
+@@ -10149,6 +10150,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver,
              break;
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
          case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -238,10 +238,10 @@ index 57164b7ae6..b557c445f8 100644
              break;
          }
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 9ef6c8bb64..6bbf1d1b2a 100644
+index 1a90311ca5..4f993c2935 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -3750,6 +3750,7 @@ qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver,
+@@ -3973,6 +3973,7 @@ qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver,
  
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
          case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -250,10 +250,10 @@ index 9ef6c8bb64..6bbf1d1b2a 100644
          case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
              break;
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 59a3b37b98..96b6d4b739 100644
+index fc1704f4fc..0ece9924e4 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -15364,6 +15364,7 @@ qemuDomainOpenGraphics(virDomainPtr dom,
+@@ -14712,6 +14712,7 @@ qemuDomainOpenGraphics(virDomainPtr dom,
          break;
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -261,7 +261,7 @@ index 59a3b37b98..96b6d4b739 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -15435,6 +15436,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom,
+@@ -14783,6 +14784,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom,
          break;
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -270,10 +270,10 @@ index 59a3b37b98..96b6d4b739 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index da92ced2f4..f722584d2d 100644
+index 4a3f4f657e..1fbb52a77b 100644
 --- a/src/qemu/qemu_hotplug.c
 +++ b/src/qemu/qemu_hotplug.c
-@@ -4211,6 +4211,7 @@ qemuDomainChangeGraphics(virQEMUDriver *driver,
+@@ -4445,6 +4445,7 @@ qemuDomainChangeGraphics(virQEMUDriver *driver,
  
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -282,10 +282,10 @@ index da92ced2f4..f722584d2d 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
      case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 81f12a368b..8f851491b3 100644
+index b9b6ccf1de..6f5ff93cf6 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -4779,6 +4779,7 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDef *graphics,
+@@ -4819,6 +4819,7 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDef *graphics,
  
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -293,7 +293,7 @@ index 81f12a368b..8f851491b3 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
      case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
-@@ -4819,6 +4820,7 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriver *driver,
+@@ -4859,6 +4860,7 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriver *driver,
  
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -301,7 +301,7 @@ index 81f12a368b..8f851491b3 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
      case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
-@@ -4988,6 +4990,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriver *driver,
+@@ -5027,6 +5029,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriver *driver,
  
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -309,7 +309,7 @@ index 81f12a368b..8f851491b3 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
      case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
      case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
-@@ -5074,6 +5077,7 @@ qemuProcessGraphicsSetupRenderNode(virDomainGraphicsDef *graphics,
+@@ -5113,6 +5116,7 @@ qemuProcessGraphicsSetupRenderNode(virDomainGraphicsDef *graphics,
      case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
      case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
@@ -317,7 +317,7 @@ index 81f12a368b..8f851491b3 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
          virReportEnumRangeError(virDomainGraphicsType, graphics->type);
          break;
-@@ -5296,6 +5300,7 @@ qemuProcessStartValidateGraphics(virDomainObj *vm)
+@@ -5334,6 +5338,7 @@ qemuProcessStartValidateGraphics(virDomainObj *vm)
  
          case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
          case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -326,10 +326,10 @@ index 81f12a368b..8f851491b3 100644
          case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
          case VIR_DOMAIN_GRAPHICS_TYPE_DBUS:
 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
-index 079009ea4b..26f376926d 100644
+index b392428f48..f0a0a91bf5 100644
 --- a/src/qemu/qemu_validate.c
 +++ b/src/qemu/qemu_validate.c
-@@ -4402,6 +4402,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics,
+@@ -4412,6 +4412,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics,
  
      case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
      case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -338,10 +338,10 @@ index 079009ea4b..26f376926d 100644
      case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
          break;
 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
-index bf0dba17d8..f66fdd5afc 100644
+index d082a07660..1cbdcaf5b5 100644
 --- a/src/vmx/vmx.c
 +++ b/src/vmx/vmx.c
-@@ -3473,6 +3473,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef
+@@ -3511,6 +3511,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef
  
            case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
            case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
@@ -350,5 +350,5 @@ index bf0dba17d8..f66fdd5afc 100644
            case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
            case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
 -- 
-2.37.3
+2.45.2
 
diff --git a/0010-libxl-add-support-for-stubdom_mem-option.patch b/0010-libxl-add-support-for-stubdom_mem-option.patch
index b70de56..52dd209 100644
--- a/0010-libxl-add-support-for-stubdom_mem-option.patch
+++ b/0010-libxl-add-support-for-stubdom_mem-option.patch
@@ -1,4 +1,4 @@
-From 6ce71603051d9895a960c8a5cef6deb6bbf1a1d9 Mon Sep 17 00:00:00 2001
+From 0255a4579ed2f7920b3156e8a5cbe0a4a47de278 Mon Sep 17 00:00:00 2001
 From: HW42 <hw42@ipsumj.de>
 Date: Sat, 22 Apr 2017 08:59:12 +0200
 Subject: [PATCH] libxl: add support for stubdom_mem option
@@ -15,16 +15,16 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  4 files changed, 35 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index ace4db7023..f9a0d631dc 100644
+index befc5e97ff..3832937d37 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -18394,6 +18394,17 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
+@@ -18990,6 +18990,17 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
      }
      def->emulator_cmdline = virXPathString("string(./devices/emulator/@cmdline)", ctxt);
  
-+    n = virXPathULong("string(./devices/emulator/@memory)",
-+                      ctxt,
-+                      &def->emulator_memory);
++    n = virXPathULongLong("string(./devices/emulator/@memory)",
++                          ctxt,
++                          &def->emulator_memory);
 +    if (n == -2) {
 +        virReportError(VIR_ERR_XML_ERROR, "%s",
 +                _("emulator memory (in KiB) must be an integer"));
@@ -36,13 +36,13 @@ index ace4db7023..f9a0d631dc 100644
      /* analysis of the disk devices */
      if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0)
          return NULL;
-@@ -20940,6 +20951,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src,
+@@ -21579,6 +21590,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDef *src,
          goto error;
      }
  
 +    if (src->emulator_memory != dst->emulator_memory) {
 +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                _("Target domain emulator memory size %lu does not match source %lu"),
++                _("Target domain emulator memory size %1$llu does not match source %2$llu"),
 +                dst->emulator_memory,
 +                src->emulator_memory);
 +        goto error;
@@ -51,32 +51,32 @@ index ace4db7023..f9a0d631dc 100644
      if (!virDomainDefFeaturesCheckABIStability(src, dst))
          goto error;
  
-@@ -27214,6 +27233,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
+@@ -28228,6 +28247,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
              virBufferAsprintf(buf, " type='%s'",
                                virDomainEmulatorTypeTypeToString(def->emulator_type));
          }
 +        if (def->emulator_memory != 0)
-+            virBufferAsprintf(buf, " memory='%lu'", def->emulator_memory);
++            virBufferAsprintf(buf, " memory='%llu'", def->emulator_memory);
          virBufferEscapeString(buf, " cmdline='%s'", def->emulator_cmdline);
          if (!def->emulator) {
              virBufferAddLit(buf, "/>\n");
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index e471c08a0a..a5e0736aad 100644
+index 44a9a6ab5c..759f4f70c2 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -2934,6 +2934,7 @@ struct _virDomainDef {
+@@ -3059,6 +3059,7 @@ struct _virDomainDef {
      char *emulator;
      virDomainEmulatorType emulator_type;
      char *emulator_cmdline;
-+    unsigned long emulator_memory;
++    unsigned long long emulator_memory;
      /* Most {caps_,hyperv_,kvm_,}feature options utilize a virTristateSwitch
       * to handle support. A few assign specific data values to the option.
       * See virDomainDefFeaturesCheckABIStability() for details. */
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index cbc3b0f49f..a10943c4da 100644
+index 3e21b51dd8..2482bf8d1e 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -3884,6 +3884,11 @@
+@@ -4156,6 +4156,11 @@
                <text/>
              </attribute>
            </optional>
@@ -88,7 +88,7 @@ index cbc3b0f49f..a10943c4da 100644
            <ref name="absFilePath"/>
          </group>
          <group>
-@@ -3894,6 +3899,11 @@
+@@ -4166,6 +4171,11 @@
                <value>stubdom-linux</value>
              </choice>
            </attribute>
@@ -101,10 +101,10 @@ index cbc3b0f49f..a10943c4da 100644
          </group>
        </choice>
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 519de16d8b..3cc99a223e 100644
+index 40106d901c..5a6738353f 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -693,6 +693,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -711,6 +711,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
              }
          }
  
@@ -115,5 +115,5 @@ index 519de16d8b..3cc99a223e 100644
              if (def->nserials == 1) {
                  if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) <
 -- 
-2.37.3
+2.45.2
 
diff --git a/0011-libxl-add-support-for-emulator-kernel-and-ramdisk-pa.patch b/0011-libxl-add-support-for-emulator-kernel-and-ramdisk-pa.patch
index d4585d5..ca6aca0 100644
--- a/0011-libxl-add-support-for-emulator-kernel-and-ramdisk-pa.patch
+++ b/0011-libxl-add-support-for-emulator-kernel-and-ramdisk-pa.patch
@@ -1,4 +1,4 @@
-From b3963c90ae7e1c8a7c5602f734b7ccddf96a90a7 Mon Sep 17 00:00:00 2001
+From efceecae6a35be5a297fb6dbc49ffc2cbe155a3c Mon Sep 17 00:00:00 2001
 From: Dmitry Fedorov <d.fedorov@tabit.pro>
 Date: Wed, 13 Apr 2022 16:19:49 +0200
 Subject: [PATCH] libxl: add support for emulator' kernel and ramdisk path
@@ -18,10 +18,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  4 files changed, 47 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index f9a0d631dc..6b15766804 100644
+index 3832937d37..93daae18f6 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -3809,6 +3809,8 @@ void virDomainDefFree(virDomainDef *def)
+@@ -4019,6 +4019,8 @@ void virDomainDefFree(virDomainDef *def)
      virBitmapFree(def->cpumask);
      g_free(def->emulator);
      g_free(def->emulator_cmdline);
@@ -30,18 +30,18 @@ index f9a0d631dc..6b15766804 100644
      g_free(def->description);
      g_free(def->title);
      g_free(def->kvm_features);
-@@ -18393,6 +18395,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
+@@ -18989,6 +18991,8 @@ virDomainDefParseXML(xmlXPathContextPtr ctxt,
          }
      }
      def->emulator_cmdline = virXPathString("string(./devices/emulator/@cmdline)", ctxt);
 +    def->emulator_kernel = virXPathString("string(./devices/emulator/@kernel)", ctxt);
 +    def->emulator_ramdisk = virXPathString("string(./devices/emulator/@ramdisk)", ctxt);
  
-     n = virXPathULong("string(./devices/emulator/@memory)",
-                       ctxt,
-@@ -27236,6 +27240,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
+     n = virXPathULongLong("string(./devices/emulator/@memory)",
+                           ctxt,
+@@ -28250,6 +28254,8 @@ virDomainDefFormatInternalSetRootName(virDomainDef *def,
          if (def->emulator_memory != 0)
-             virBufferAsprintf(buf, " memory='%lu'", def->emulator_memory);
+             virBufferAsprintf(buf, " memory='%llu'", def->emulator_memory);
          virBufferEscapeString(buf, " cmdline='%s'", def->emulator_cmdline);
 +        virBufferEscapeString(buf, " kernel='%s'", def->emulator_kernel);
 +        virBufferEscapeString(buf, " ramdisk='%s'", def->emulator_ramdisk);
@@ -49,23 +49,23 @@ index f9a0d631dc..6b15766804 100644
              virBufferAddLit(buf, "/>\n");
          } else {
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index a5e0736aad..566c4beeb4 100644
+index 759f4f70c2..b3edac1587 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -2934,6 +2934,8 @@ struct _virDomainDef {
+@@ -3059,6 +3059,8 @@ struct _virDomainDef {
      char *emulator;
      virDomainEmulatorType emulator_type;
      char *emulator_cmdline;
 +    char *emulator_kernel;
 +    char *emulator_ramdisk;
-     unsigned long emulator_memory;
+     unsigned long long emulator_memory;
      /* Most {caps_,hyperv_,kvm_,}feature options utilize a virTristateSwitch
       * to handle support. A few assign specific data values to the option.
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index a10943c4da..7e674d6a6e 100644
+index 2482bf8d1e..44c21582ce 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -3889,6 +3889,16 @@
+@@ -4161,6 +4161,16 @@
                <ref name="memoryKB"/>
              </attribute>
            </optional>
@@ -82,7 +82,7 @@ index a10943c4da..7e674d6a6e 100644
            <ref name="absFilePath"/>
          </group>
          <group>
-@@ -3904,6 +3914,16 @@
+@@ -4176,6 +4186,16 @@
                <ref name="memoryKB"/>
              </attribute>
            </optional>
@@ -100,35 +100,35 @@ index a10943c4da..7e674d6a6e 100644
          </group>
        </choice>
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 3cc99a223e..1ca48fb3a7 100644
+index 5a6738353f..39a97b0405 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -693,6 +693,25 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -711,6 +711,25 @@ libxlMakeDomBuildInfo(virDomainDef *def,
              }
          }
  
 +        if (def->emulator_kernel) {
 +            if (!virFileExists(def->emulator_kernel)) {
 +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("emulator's kernel '%s' not found"),
++                               _("emulator's kernel '%1$s' not found"),
 +                               def->emulator_kernel);
 +                return -1;
 +            }
-+	    b_info->stubdomain_kernel = g_strdup(def->emulator_kernel);
-+	}
++            b_info->stubdomain_kernel = g_strdup(def->emulator_kernel);
++        }
 +        if (def->emulator_ramdisk) {
 +            if (!virFileExists(def->emulator_ramdisk)) {
 +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("emulator's ramdisk '%s' not found"),
++                               _("emulator's ramdisk '%1$s' not found"),
 +                               def->emulator_ramdisk);
 +                return -1;
 +            }
-+	    b_info->stubdomain_ramdisk = g_strdup(def->emulator_ramdisk);
-+	}
++            b_info->stubdomain_ramdisk = g_strdup(def->emulator_ramdisk);
++        }
 +
          if (def->emulator_memory != 0)
              b_info->stubdomain_memkb = def->emulator_memory;
  
 -- 
-2.37.3
+2.45.2
 
diff --git a/0012-libxl-Fix-setting-invtsc-in-Xen-4.14.patch b/0012-libxl-Fix-setting-invtsc-in-Xen-4.14.patch
index 0215729..c7f2e02 100644
--- a/0012-libxl-Fix-setting-invtsc-in-Xen-4.14.patch
+++ b/0012-libxl-Fix-setting-invtsc-in-Xen-4.14.patch
@@ -1,4 +1,4 @@
-From f0a1b52e902fcf41244e1b57b2814d6bdcacbd43 Mon Sep 17 00:00:00 2001
+From de6dcd12f817428e8ec90611b04c86d5ff5a2c47 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Wed, 13 Apr 2022 15:58:50 +0200
@@ -17,10 +17,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 1ca48fb3a7..017c5ee590 100644
+index 39a97b0405..389b6a1411 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -512,6 +512,13 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -516,6 +516,13 @@ libxlMakeDomBuildInfo(virDomainDef *def,
                                  hasHwVirt = true;
                                  continue;
                              }
@@ -35,5 +35,5 @@ index 1ca48fb3a7..017c5ee590 100644
                              g_snprintf(xlCPU,
                                         sizeof(xlCPU),
 -- 
-2.37.3
+2.45.2
 
diff --git a/0013-libxl-fail-with-distinct-error-on-unsupported-PM-sus.patch b/0013-libxl-fail-with-distinct-error-on-unsupported-PM-sus.patch
index 9859135..5d8acd1 100644
--- a/0013-libxl-fail-with-distinct-error-on-unsupported-PM-sus.patch
+++ b/0013-libxl-fail-with-distinct-error-on-unsupported-PM-sus.patch
@@ -1,4 +1,4 @@
-From e33af4836a12f29e2560468915a3ccde1626222e Mon Sep 17 00:00:00 2001
+From 5fbbb1f38f5687eee7a25c129abbebfa5d036b0c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Fri, 28 Oct 2022 03:21:40 +0200
@@ -17,7 +17,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 76fd07ada0..45b95070e4 100644
+index 6aac88d940..e96684e483 100644
 --- a/src/libxl/libxl_driver.c
 +++ b/src/libxl/libxl_driver.c
 @@ -1491,7 +1491,11 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom,
@@ -27,12 +27,12 @@ index 76fd07ada0..45b95070e4 100644
 -    if (ret < 0) {
 +    if (ret == ERROR_NOPARAVIRT) {
 +        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-+                       _("Domain '%d' does not support suspend"), vm->def->id);
++                       _("Domain '%1$d' does not support suspend"), vm->def->id);
 +        goto endjob;
 +    } else if (ret < 0) {
          virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Failed to suspend domain '%d'"), vm->def->id);
+                        _("Failed to suspend domain '%1$d'"), vm->def->id);
          goto endjob;
 -- 
-2.37.3
+2.45.2
 
diff --git a/0014-libxl-add-support-for-xengt-video-device.patch b/0014-libxl-add-support-for-xengt-video-device.patch
index a3e956e..0484eaa 100644
--- a/0014-libxl-add-support-for-xengt-video-device.patch
+++ b/0014-libxl-add-support-for-xengt-video-device.patch
@@ -1,4 +1,4 @@
-From d83ee492f5fd0263773f4c31ba06740abef82393 Mon Sep 17 00:00:00 2001
+From 12ba2585c1866785b35e06d25efc24d104b42569 Mon Sep 17 00:00:00 2001
 From: Ivan Kardykov <kardykov@tabit.pro>
 Date: Sat, 19 Nov 2022 23:40:29 +0100
 Subject: [PATCH] libxl: add support for xengt video device
@@ -11,18 +11,22 @@ Add ability to configure xengt video device with options.
 Signed-off-by: Ivan Kardykov <kardykov@tabit.pro>
 Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 ---
- src/conf/domain_conf.c            | 29 +++++++++++++++++++++++++++++
+ src/conf/domain_conf.c            | 11 +++++++++++
  src/conf/domain_conf.h            |  4 ++++
  src/conf/schemas/domaincommon.rng | 20 ++++++++++++++++++++
  src/libxl/libxl_conf.c            |  9 +++++++++
  src/libxl/libxl_domain.c          |  1 +
- 5 files changed, 63 insertions(+)
+ src/qemu/qemu_command.c           |  3 +++
+ src/qemu/qemu_domain_address.c    |  1 +
+ src/qemu/qemu_monitor_json.c      |  2 ++
+ src/qemu/qemu_process.c           |  1 +
+ 9 files changed, 52 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 6b15766804..e7cfddf11c 100644
+index 93daae18f6..d9efdeef11 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -859,6 +859,7 @@ VIR_ENUM_IMPL(virDomainVideo,
+@@ -884,6 +884,7 @@ VIR_ENUM_IMPL(virDomainVideo,
                "cirrus",
                "vmvga",
                "xen",
@@ -30,7 +34,7 @@ index 6b15766804..e7cfddf11c 100644
                "vbox",
                "qxl",
                "parallels",
-@@ -12606,6 +12607,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def,
+@@ -12969,6 +12970,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def,
      switch (type) {
      case VIR_DOMAIN_VIDEO_TYPE_VGA:
      case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
@@ -38,52 +42,27 @@ index 6b15766804..e7cfddf11c 100644
      case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
          if (def->virtType == VIR_DOMAIN_VIRT_VBOX)
              return 8 * 1024;
-@@ -12731,6 +12733,9 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
-     g_autofree char *ram = NULL;
-     g_autofree char *vgamem = NULL;
-     g_autofree char *primary = NULL;
-+    g_autofree char *low_gm_sz = NULL;
-+    g_autofree char *high_gm_sz = NULL;
-+    g_autofree char *fence_sz = NULL;
+@@ -13117,6 +13119,15 @@ virDomainVideoModelDefParseXML(virDomainVideoDef *def,
+     if (virXMLPropUInt(node, "vgamem", 10, VIR_XML_PROP_NONE, &def->vgamem) < 0)
+         return -1;
  
-     if (!(def = virDomainVideoDefNew(xmlopt)))
-         return NULL;
-@@ -12799,6 +12804,30 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
-         }
-     }
- 
-+    if ((heads = virXPathString("string(./model/@low_gm_sz)", ctxt))) {
-+        if (virStrToLong_uip(heads, NULL, 10, &def->low_gm_sz) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse video low_gm_sz '%s'"), heads);
-+            return NULL;
-+        }
-+    }
++    if (virXMLPropUInt(node, "low_gm_sz", 10, VIR_XML_PROP_NONE, &def->low_gm_sz) < 0)
++        return -1;
 +
-+    if ((heads = virXPathString("string(./model/@high_gm_sz)", ctxt))) {
-+        if (virStrToLong_uip(heads, NULL, 10, &def->high_gm_sz) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse video high_gm_sz '%s'"), heads);
-+            return NULL;
-+        }
-+    }
++    if (virXMLPropUInt(node, "high_gm_sz", 10, VIR_XML_PROP_NONE, &def->high_gm_sz) < 0)
++        return -1;
 +
-+    if ((heads = virXPathString("string(./model/@fence_sz)", ctxt))) {
-+        if (virStrToLong_uip(heads, NULL, 10, &def->fence_sz) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse video fence_sz '%s'"), heads);
-+            return NULL;
-+        }
-+    }
++    if (virXMLPropUInt(node, "fence_sz", 10, VIR_XML_PROP_NONE, &def->fence_sz) < 0)
++        return -1;
 +
-     if ((heads = virXPathString("string(./model/@heads)", ctxt))) {
-         if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
+     if (virXMLPropUIntDefault(node, "heads", 10, VIR_XML_PROP_NONE, &def->heads, 1) < 0)
+         return -1;
+ 
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 566c4beeb4..07937bad34 100644
+index b3edac1587..1ee3149603 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -1741,6 +1741,7 @@ typedef enum {
+@@ -1786,6 +1786,7 @@ typedef enum {
      VIR_DOMAIN_VIDEO_TYPE_CIRRUS,
      VIR_DOMAIN_VIDEO_TYPE_VMVGA,
      VIR_DOMAIN_VIDEO_TYPE_XEN,
@@ -91,7 +70,7 @@ index 566c4beeb4..07937bad34 100644
      VIR_DOMAIN_VIDEO_TYPE_VBOX,
      VIR_DOMAIN_VIDEO_TYPE_QXL,
      VIR_DOMAIN_VIDEO_TYPE_PARALLELS, /* pseudo device for VNC in containers */
-@@ -1789,6 +1790,9 @@ struct _virDomainVideoDef {
+@@ -1834,6 +1835,9 @@ struct _virDomainVideoDef {
      unsigned int vram64; /* kibibytes (multiples of 1024) */
      unsigned int vgamem; /* kibibytes (multiples of 1024) */
      unsigned int heads;
@@ -102,10 +81,10 @@ index 566c4beeb4..07937bad34 100644
      virDomainVideoAccelDef *accel;
      virDomainVideoResolutionDef *res;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index 7e674d6a6e..735125c14a 100644
+index 44c21582ce..1f0f942065 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -4465,6 +4465,26 @@
+@@ -4737,6 +4737,26 @@
                    </attribute>
                  </optional>
                </group>
@@ -133,10 +112,10 @@ index 7e674d6a6e..735125c14a 100644
              <optional>
                <attribute name="vram">
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 017c5ee590..85abe92e3c 100644
+index 389b6a1411..444e76d117 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -2434,6 +2434,15 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config *d_config)
+@@ -2437,6 +2437,15 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config *d_config)
                  return -1;
              }
              break;
@@ -150,13 +129,13 @@ index 017c5ee590..85abe92e3c 100644
 +               b_info->u.hvm.vgt_fence_sz = def->videos[0]->fence_sz;
 +            break;
  
-         default:
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+         case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
+         case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index ad27c4ef8b..8620efc4f0 100644
+index 1a2487e999..d9f5256f86 100644
 --- a/src/libxl/libxl_domain.c
 +++ b/src/libxl/libxl_domain.c
-@@ -189,6 +189,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDef *dev,
+@@ -195,6 +195,7 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDef *dev,
                              dev->data.video->vram = 8 * 1024;
                      }
                      break;
@@ -164,6 +143,78 @@ index ad27c4ef8b..8620efc4f0 100644
                  case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
                      if (dev->data.video->vram == 0) {
                          if (dm_type == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN)
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index b02b09a825..61beb44260 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -80,6 +80,7 @@ VIR_ENUM_IMPL(qemuVideo,
+               "cirrus",
+               "vmware",
+               "", /* don't support xen */
++              "", /* don't support xengt */
+               "", /* don't support vbox */
+               "qxl",
+               "", /* don't support parallels */
+@@ -756,6 +757,7 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
+                 break;
+             case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
+             case VIR_DOMAIN_VIDEO_TYPE_XEN:
++            case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+             case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+             case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+             case VIR_DOMAIN_VIDEO_TYPE_GOP:
+@@ -783,6 +785,7 @@ qemuDeviceVideoGetModel(virQEMUCaps *qemuCaps,
+             case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
+             case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
+             case VIR_DOMAIN_VIDEO_TYPE_XEN:
++            case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+             case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+             case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+             case VIR_DOMAIN_VIDEO_TYPE_GOP:
+diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
+index 251f5b7e1a..52e11584b3 100644
+--- a/src/qemu/qemu_domain_address.c
++++ b/src/qemu/qemu_domain_address.c
+@@ -871,6 +871,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
+         case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
+         case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
+         case VIR_DOMAIN_VIDEO_TYPE_XEN:
++        case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+         case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+         case VIR_DOMAIN_VIDEO_TYPE_QXL:
+         case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 89ea33a3ab..0b842838d8 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -1803,6 +1803,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitor *mon,
+     case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
+     case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
+     case VIR_DOMAIN_VIDEO_TYPE_XEN:
++    case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+     case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+     case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
+@@ -1852,6 +1853,7 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitor *mon,
+     case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
+     case VIR_DOMAIN_VIDEO_TYPE_VMVGA:
+     case VIR_DOMAIN_VIDEO_TYPE_XEN:
++    case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+     case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+     case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 6f5ff93cf6..bce65382d1 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -3045,6 +3045,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver,
+         case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
+         case VIR_DOMAIN_VIDEO_TYPE_CIRRUS:
+         case VIR_DOMAIN_VIDEO_TYPE_XEN:
++        case VIR_DOMAIN_VIDEO_TYPE_XENGT:
+         case VIR_DOMAIN_VIDEO_TYPE_VBOX:
+         case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+         case VIR_DOMAIN_VIDEO_TYPE_VIRTIO:
 -- 
-2.37.3
+2.45.2
 
diff --git a/0021-libxl-set-net-disk-trusted-parameter-based-on-backen.patch b/0015-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
similarity index 90%
rename from 0021-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
rename to 0015-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
index 66c5a99..050d629 100644
--- a/0021-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
+++ b/0015-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
@@ -1,4 +1,4 @@
-From c525832d8ecd3275415b406ccc6d6d7f1e3dc327 Mon Sep 17 00:00:00 2001
+From 52d7efc085374cf207acc407aa9e0d8ec5c7bcfa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Thu, 5 Jan 2023 17:53:53 +0100
@@ -16,6 +16,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  tests/libxlxml2domconfigdata/basic-pv.json              | 6 ++++--
  tests/libxlxml2domconfigdata/basic-pvh.json             | 6 ++++--
  tests/libxlxml2domconfigdata/cpu-shares-hvm.json        | 6 ++++--
+ tests/libxlxml2domconfigdata/efi-hvm.json               | 6 ++++--
  tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json    | 3 ++-
  tests/libxlxml2domconfigdata/fullvirt-cpuid.json        | 3 ++-
  tests/libxlxml2domconfigdata/max-eventchannels-hvm.json | 6 ++++--
@@ -24,23 +25,23 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  tests/libxlxml2domconfigdata/multiple-ip.json           | 3 ++-
  tests/libxlxml2domconfigdata/variable-clock-hvm.json    | 6 ++++--
  tests/libxlxml2domconfigdata/vnuma-hvm.json             | 6 ++++--
- 13 files changed, 50 insertions(+), 22 deletions(-)
+ 14 files changed, 54 insertions(+), 24 deletions(-)
 
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index fef19e6ace..fd57ebf79b 100644
+index 444e76d117..fa1701d505 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -1265,6 +1265,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
+@@ -1254,6 +1254,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
+     }
  
-     if (l_disk->domain_name)
-         x_disk->backend_domname = g_strdup(l_disk->domain_name);
+     x_disk->backend_domname = g_strdup(l_disk->domain_name);
 +#ifdef LIBXL_HAVE_DISK_TRUSTED
 +    libxl_defbool_set(&x_disk->trusted, l_disk->domain_name == NULL);
 +#endif
  
      return 0;
  }
-@@ -1480,6 +1483,9 @@ libxlMakeNic(virDomainDef *def,
+@@ -1467,6 +1470,9 @@ libxlMakeNic(virDomainDef *def,
  
      if (l_nic->domain_name)
          x_nic->backend_domname = g_strdup(l_nic->domain_name);
@@ -142,6 +143,30 @@ index 15105c83ad..298acbc2db 100644
              "script": "/etc/xen/scripts/vif-bridge",
 -            "nictype": "vif_ioemu"
 +            "nictype": "vif_ioemu",
++            "trusted": "True"
+         }
+     ],
+     "vfbs": [
+diff --git a/tests/libxlxml2domconfigdata/efi-hvm.json b/tests/libxlxml2domconfigdata/efi-hvm.json
+index 32b5a49c3f..f2128b1a9c 100644
+--- a/tests/libxlxml2domconfigdata/efi-hvm.json
++++ b/tests/libxlxml2domconfigdata/efi-hvm.json
+@@ -57,7 +57,8 @@
+             "backend": "qdisk",
+             "format": "raw",
+             "removable": 1,
+-            "readwrite": 1
++            "readwrite": 1,
++            "trusted": "True"
+         }
+     ],
+     "nics": [
+@@ -66,7 +67,8 @@
+             "mac": "00:16:3e:66:12:b4",
+             "bridge": "br0",
+             "script": "/etc/xen/scripts/vif-bridge",
+-            "nictype": "vif_ioemu"
++            "nictype": "vif_ioemu",
 +            "trusted": "True"
          }
      ],
@@ -319,5 +344,5 @@ index 68c1c2501d..4d3507e7da 100644
      ],
      "vfbs": [
 -- 
-2.37.3
+2.45.2
 
diff --git a/0015-tests-Fix-libxlxml2domconfigtest.patch b/0015-tests-Fix-libxlxml2domconfigtest.patch
deleted file mode 100644
index b6f505a..0000000
--- a/0015-tests-Fix-libxlxml2domconfigtest.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From fa45ff88c06084ca84b3d1ccf648721f6e8b6a26 Mon Sep 17 00:00:00 2001
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Thu, 10 Nov 2022 17:55:38 -0700
-Subject: [PATCH] tests: Fix libxlxml2domconfigtest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Downstream CI recently encountered failures of libxlxml2domconfigtest when
-building libvirt packages against Xen 4.17 rc3 packages. The test fails on
-vnuma_hvm config, where suddently the actual json produced by
-libxl_domain_config_to_json() contains a 'pnode' entry in the 'vnuma_nodes'
-list, which is absent in the expected json. It appears the test has thus far
-passed by luck. E.g. I was able to make the test pass in the failing
-environment by changing the meson buildtype from debugoptimized to debug.
-
-When a VM config contains vnuma settings, libxlMakeVnumaList() checks if the
-number of requested vnuma nodes exceeds the number of physical nodes. The
-number of physical nodes is retrieved with libxl_get_physinfo(), which can
-return wildly different results in the context of unit tests. This change
-mocks libxl_get_physinfo() to return consistent results. All fields of the
-libxl_physinfo struct are set to 0 except nr_nodes, which is set to 6 to
-ensure the vnuma_hvm configuration is properly tested.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- tests/libxlmock.c                           | 15 +++++++++++++++
- tests/libxlxml2domconfigdata/vnuma-hvm.json |  5 +++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/tests/libxlmock.c b/tests/libxlmock.c
-index 4754597e5b..205d34df19 100644
---- a/tests/libxlmock.c
-+++ b/tests/libxlmock.c
-@@ -70,6 +70,21 @@ VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info,
-     return &info;
- }
- 
-+VIR_MOCK_IMPL_RET_ARGS(libxl_get_physinfo,
-+                       int,
-+                       libxl_ctx *, ctx,
-+                       libxl_physinfo *, physinfo)
-+{
-+    memset(physinfo, 0, sizeof(*physinfo));
-+    physinfo->nr_nodes = 6;
-+
-+    /* silence gcc warning about unused function */
-+    if (0)
-+        real_libxl_get_physinfo(ctx, physinfo);
-+
-+    return 0;
-+}
-+
- VIR_MOCK_STUB_RET_ARGS(libxl_get_free_memory,
-                        int, 0,
-                        libxl_ctx *, ctx,
-diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json
-index 2556c82d5f..68c1c2501d 100644
---- a/tests/libxlxml2domconfigdata/vnuma-hvm.json
-+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json
-@@ -39,6 +39,7 @@
-                     41,
-                     51
-                 ],
-+                "pnode": 1,
-                 "vcpus": [
-                     1
-                 ]
-@@ -53,6 +54,7 @@
-                     31,
-                     41
-                 ],
-+                "pnode": 2,
-                 "vcpus": [
-                     2
-                 ]
-@@ -67,6 +69,7 @@
-                     21,
-                     31
-                 ],
-+                "pnode": 3,
-                 "vcpus": [
-                     3
-                 ]
-@@ -81,6 +84,7 @@
-                     10,
-                     21
-                 ],
-+                "pnode": 4,
-                 "vcpus": [
-                     4
-                 ]
-@@ -95,6 +99,7 @@
-                     21,
-                     10
-                 ],
-+                "pnode": 5,
-                 "vcpus": [
-                     5
-                 ]
--- 
-2.37.3
-
diff --git a/0016-Revert-meson-Replace-meson.source_root-with-meson.pr.patch b/0016-Revert-meson-Replace-meson.source_root-with-meson.pr.patch
deleted file mode 100644
index 3aa8502..0000000
--- a/0016-Revert-meson-Replace-meson.source_root-with-meson.pr.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From b58095ee8642f5ee939c936017d43fb04d0f2552 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Sun, 20 Nov 2022 01:10:56 +0100
-Subject: [PATCH] Revert "meson: Replace meson.source_root() with
- meson.project_source_root()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make it work temporarily with older meson.
-
-This reverts commit 3395c35f2f87d8f40e0648ce77c230b525a84d9a.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- build-aux/meson.build                   | 2 +-
- docs/meson.build                        | 4 ++--
- meson.build                             | 4 ++--
- po/meson.build                          | 2 +-
- src/access/meson.build                  | 2 +-
- src/esx/meson.build                     | 4 ++--
- src/hyperv/meson.build                  | 2 +-
- src/meson.build                         | 4 ++--
- src/util/meson.build                    | 4 ++--
- tests/meson.build                       | 4 ++--
- tools/wireshark/src/libvirt/meson.build | 8 ++++----
- 11 files changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/build-aux/meson.build b/build-aux/meson.build
-index 16d085505d..3784b7cc3f 100644
---- a/build-aux/meson.build
-+++ b/build-aux/meson.build
-@@ -29,7 +29,7 @@ endif
- awk_prog = find_program('awk')
- 
- syntax_check_conf = configuration_data({
--  'top_srcdir': meson.project_source_root(),
-+  'top_srcdir': meson.source_root(),
-   'top_builddir': meson.project_build_root(),
-   'flake8_path': flake8_path,
-   'runutf8': ' '.join(runutf8),
-diff --git a/docs/meson.build b/docs/meson.build
-index 5c0c762db1..7bae5c1481 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -263,7 +263,7 @@ hvsupport_html_in = custom_target(
-     meson_python_prog,
-     python3_prog,
-     hvsupport_prog,
--    meson.project_source_root(),
-+    meson.source_root(),
-     meson.project_build_root(),
-   ],
-   capture: true,
-@@ -282,7 +282,7 @@ html_xslt_gen += {
-   'file': hvsupport_html_in,
- }
- 
--news_html_in = docs_rst2html5_gen.process(meson.project_source_root() / 'NEWS.rst')
-+news_html_in = docs_rst2html5_gen.process(meson.source_root() / 'NEWS.rst')
- html_xslt_gen += {
-   'name': 'news',
-   'file': news_html_in,
-diff --git a/meson.build b/meson.build
-index 93de355430..5f913d89d1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -27,7 +27,7 @@ conf = configuration_data()
- 
- conf.set('_GNU_SOURCE', 1)
- conf.set_quoted('abs_top_builddir', meson.project_build_root())
--conf.set_quoted('abs_top_srcdir', meson.project_source_root())
-+conf.set_quoted('abs_top_srcdir', meson.source_root())
- conf.set_quoted('PACKAGE', meson.project_name())
- conf.set_quoted('PACKAGE_NAME', meson.project_name())
- conf.set_quoted('PACKAGE_VERSION', meson.project_version())
-@@ -514,7 +514,7 @@ elif host_machine.system() == 'darwin'
-   # macOS libraries don't support symbol versioning
-   version_script_flags = ''
- else
--  test_file = '@0@/src/libvirt_qemu.syms'.format(meson.project_source_root())
-+  test_file = '@0@/src/libvirt_qemu.syms'.format(meson.source_root())
-   if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file))
-     version_script_flags = '-Wl,--version-script='
-   else
-diff --git a/po/meson.build b/po/meson.build
-index fbfdc2d08d..0f2a1bb617 100644
---- a/po/meson.build
-+++ b/po/meson.build
-@@ -7,7 +7,7 @@ i18n.gettext(
-     '--keyword=_',
-     '--keyword=N_',
-     '--add-comments=TRANSLATORS:',
--    '--directory=@0@'.format(meson.project_source_root()),
-+    '--directory=@0@'.format(meson.source_root()),
-     '--directory=@0@'.format(meson.project_build_root()),
-     '--files-from=@0@'.format(meson.current_source_dir() / 'POTFILES'),
-     '--msgid-bugs-address=https://libvirt.org/bugs.html',
-diff --git a/src/access/meson.build b/src/access/meson.build
-index 07fd7d372e..dba08a6e87 100644
---- a/src/access/meson.build
-+++ b/src/access/meson.build
-@@ -11,7 +11,7 @@ access_polkit_sources = [
- 
- access_perm_h = files('viraccessperm.h')
- 
--remote_path = meson.project_source_root() / 'src' / 'remote'
-+remote_path = meson.source_root() / 'src' / 'remote'
- 
- access_gen_headers = []
- access_gen_sources = []
-diff --git a/src/esx/meson.build b/src/esx/meson.build
-index d1f42fdcc4..2d05294ba1 100644
---- a/src/esx/meson.build
-+++ b/src/esx/meson.build
-@@ -26,7 +26,7 @@ esx_gen_headers = custom_target(
-   ],
-   command: [
-     meson_python_prog, python3_prog, esx_vi_generator_prog,
--    meson.project_source_root() / 'src',
-+    meson.source_root() / 'src',
-     meson.project_build_root() / 'src',
-     'header',
-   ],
-@@ -47,7 +47,7 @@ esx_gen_sources = custom_target(
-   ],
-   command: [
-     meson_python_prog, python3_prog, esx_vi_generator_prog,
--    meson.project_source_root() / 'src',
-+    meson.source_root() / 'src',
-     meson.project_build_root() / 'src',
-     'source',
-   ],
-diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build
-index 3509ce12f7..2589fc5437 100644
---- a/src/hyperv/meson.build
-+++ b/src/hyperv/meson.build
-@@ -18,7 +18,7 @@ hyperv_gen_sources = custom_target(
-   ],
-   command: [
-     meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
--    meson.project_source_root() / 'src',
-+    meson.source_root() / 'src',
-     meson.project_build_root() / 'src',
-   ],
- )
-diff --git a/src/meson.build b/src/meson.build
-index 35951d8990..53c6c596a7 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,7 +4,7 @@ src_dep = declare_dependency(
-   compile_args: [
-     '-DIN_LIBVIRT',
-     '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
--    '-Dabs_top_srcdir="@0@"'.format(meson.project_source_root()),
-+    '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
-   ] + coverage_flags + win32_flags,
-   dependencies: [
-     glib_dep,
-@@ -1033,7 +1033,7 @@ run_pkg_config_files = [
- run_pkg_config_conf = configuration_data({
-   'VERSION': meson.project_version(),
-   'abs_top_builddir': meson.project_build_root(),
--  'abs_top_srcdir': meson.project_source_root(),
-+  'abs_top_srcdir': meson.source_root(),
- })
- 
- foreach file : run_pkg_config_files
-diff --git a/src/util/meson.build b/src/util/meson.build
-index c81500ea04..07ae94631c 100644
---- a/src/util/meson.build
-+++ b/src/util/meson.build
-@@ -137,8 +137,8 @@ keyname_list = [
-   'win32',
- ]
- 
--keymap_gen_prog = find_program('@0@/src/keycodemapdb/tools/keymap-gen'.format(meson.project_source_root()))
--keymap_src_file = '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.project_source_root())
-+keymap_gen_prog = find_program('@0@/src/keycodemapdb/tools/keymap-gen'.format(meson.source_root()))
-+keymap_src_file = '@0@/src/keycodemapdb/data/keymaps.csv'.format(meson.source_root())
- 
- foreach name : keycode_list
-   keycode_gen_sources += custom_target(
-diff --git a/tests/meson.build b/tests/meson.build
-index 1149211756..8e7dc0cbfb 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -3,7 +3,7 @@ tests_dep = declare_dependency(
-     '-Dabs_builddir="@0@"'.format(meson.current_build_dir()),
-     '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
-     '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()),
--    '-Dabs_top_srcdir="@0@"'.format(meson.project_source_root()),
-+    '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
-   ] + coverage_flags + cc_flags_relaxed_frame_limit,
-   dependencies: [
-     apparmor_dep,
-@@ -37,7 +37,7 @@ tests_env = [
-   'abs_builddir=@0@'.format(meson.current_build_dir()),
-   'abs_srcdir=@0@'.format(meson.current_source_dir()),
-   'abs_top_builddir=@0@'.format(meson.project_build_root()),
--  'abs_top_srcdir=@0@'.format(meson.project_source_root()),
-+  'abs_top_srcdir=@0@'.format(meson.source_root()),
-   'LC_ALL=C',
-   'LIBVIRT_AUTOSTART=0',
- ]
-diff --git a/tools/wireshark/src/libvirt/meson.build b/tools/wireshark/src/libvirt/meson.build
-index 9c3b8aadc1..9d54f827d3 100644
---- a/tools/wireshark/src/libvirt/meson.build
-+++ b/tools/wireshark/src/libvirt/meson.build
-@@ -1,10 +1,10 @@
- wireshark_protocol = custom_target(
-   'protocol.h',
-   input: [
--    meson.project_source_root() / 'src' / 'remote' / 'remote_protocol.x',
--    meson.project_source_root() / 'src' / 'remote' / 'qemu_protocol.x',
--    meson.project_source_root() / 'src' / 'remote' / 'lxc_protocol.x',
--    meson.project_source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x',
-+    meson.source_root() / 'src' / 'remote' / 'remote_protocol.x',
-+    meson.source_root() / 'src' / 'remote' / 'qemu_protocol.x',
-+    meson.source_root() / 'src' / 'remote' / 'lxc_protocol.x',
-+    meson.source_root() / 'src' / 'rpc' / 'virkeepaliveprotocol.x',
-   ],
-   output: [
-     'protocol.h',
--- 
-2.37.3
-
diff --git a/0022-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch b/0016-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
similarity index 87%
rename from 0022-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
rename to 0016-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
index 0184e25..4d5b0aa 100644
--- a/0022-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
+++ b/0016-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
@@ -1,4 +1,4 @@
-From 3a9226aa90cd9d3e7da4bb2e1de7bc72dab087a9 Mon Sep 17 00:00:00 2001
+From 27a514c9604fcfa5f9397e8a700253e9d271b7c1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
  <marmarek@invisiblethingslab.com>
 Date: Sat, 5 Aug 2023 22:53:39 +0200
@@ -23,10 +23,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index fd57ebf79b..f89f2dd978 100644
+index fa1701d505..0fb48e7995 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -874,8 +874,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
+@@ -873,8 +873,9 @@ libxlMakeDomBuildInfo(virDomainDef *def,
  
      /* Allow libxl to calculate shadow memory requirements */
      b_info->shadow_memkb =
@@ -39,10 +39,10 @@ index fd57ebf79b..f89f2dd978 100644
      if (def->namespaceData) {
          libxlDomainXmlNsDef *nsdata = def->namespaceData;
 diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index 8620efc4f0..6c2313fdf8 100644
+index d9f5256f86..7991909bab 100644
 --- a/src/libxl/libxl_domain.c
 +++ b/src/libxl/libxl_domain.c
-@@ -325,6 +325,7 @@ virDomainDefParserConfig libxlDomainDefParserConfig = {
+@@ -366,6 +366,7 @@ virDomainDefParserConfig libxlDomainDefParserConfig = {
  
      .features = VIR_DOMAIN_DEF_FEATURE_USER_ALIAS |
                  VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT |
@@ -51,5 +51,5 @@ index 8620efc4f0..6c2313fdf8 100644
  };
  
 -- 
-2.41.0
+2.45.2
 
diff --git a/0023-Add-powerManagementFiltering-for-PCI-PM-control.patch b/0017-Add-powerManagementFiltering-for-PCI-PM-control.patch
similarity index 83%
rename from 0023-Add-powerManagementFiltering-for-PCI-PM-control.patch
rename to 0017-Add-powerManagementFiltering-for-PCI-PM-control.patch
index 60e7ec5..53900ac 100644
--- a/0023-Add-powerManagementFiltering-for-PCI-PM-control.patch
+++ b/0017-Add-powerManagementFiltering-for-PCI-PM-control.patch
@@ -1,9 +1,13 @@
-From 0cecd8256c4c6fdc466d7beb9612ed080e1aeb07 Mon Sep 17 00:00:00 2001
+From a566f1ffca0df1cde5da63bc97a260ea0ef3f188 Mon Sep 17 00:00:00 2001
 From: Simon Gaiser <simon@invisiblethingslab.com>
 Date: Mon, 12 Feb 2024 10:53:55 +0100
 Subject: [PATCH] Add powerManagementFiltering for PCI PM control
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 TODO: doc, non-libxl
+Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 ---
  src/conf/domain_conf.c            |  9 +++++++++
  src/conf/domain_conf.h            |  1 +
@@ -13,10 +17,10 @@ TODO: doc, non-libxl
  5 files changed, 43 insertions(+), 2 deletions(-)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index e7cfddf11c..6db1f2693f 100644
+index d9efdeef11..2e7cfb12fb 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -5654,6 +5654,11 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
+@@ -5853,6 +5853,11 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
                                 &def->writeFiltering) < 0)
          return -1;
  
@@ -28,7 +32,7 @@ index e7cfddf11c..6db1f2693f 100644
      if ((address = virXPathNode("./address", ctxt)) &&
          virPCIDeviceAddressParseXML(address, &def->source.subsys.u.pci.addr) < 0)
          return -1;
-@@ -22991,6 +22996,10 @@ virDomainHostdevDefFormatSubsysPCI(virBuffer *buf,
+@@ -23685,6 +23690,10 @@ virDomainHostdevDefFormatSubsysPCI(virBuffer *buf,
              virBufferAsprintf(&sourceAttrBuf, " writeFiltering='%s'",
                                virTristateBoolTypeToString(def->writeFiltering));
  
@@ -36,14 +40,14 @@ index e7cfddf11c..6db1f2693f 100644
 +            virBufferAsprintf(&sourceAttrBuf, " powerManagementFiltering='%s'",
 +                              virTristateBoolTypeToString(def->powerManagementFiltering));
 +
-     if (pcisrc->backend != VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
-         const char *backend = virDomainHostdevSubsysPCIBackendTypeToString(pcisrc->backend);
+     virPCIDeviceAddressFormat(&sourceChildBuf, pcisrc->addr, includeTypeInAddr);
  
+     if (pcisrc->origstates &&
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 07937bad34..293d17bd09 100644
+index 1ee3149603..2ea41bdc39 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -388,6 +388,7 @@ struct _virDomainHostdevDef {
+@@ -368,6 +368,7 @@ struct _virDomainHostdevDef {
      bool readonly;
      bool shareable;
      virTristateBool writeFiltering;
@@ -52,10 +56,10 @@ index 07937bad34..293d17bd09 100644
      union {
          virDomainHostdevSubsys subsys;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
-index 735125c14a..b7692c20ea 100644
+index 1f0f942065..e8c5f9e065 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
-@@ -6070,6 +6070,11 @@
+@@ -6436,6 +6436,11 @@
              <ref name="virYesNo"/>
            </attribute>
          </optional>
@@ -68,10 +72,10 @@ index 735125c14a..b7692c20ea 100644
            <ref name="pciaddress"/>
          </element>
 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index f89f2dd978..aa2062bef3 100644
+index 0fb48e7995..96d6e68472 100644
 --- a/src/libxl/libxl_conf.c
 +++ b/src/libxl/libxl_conf.c
-@@ -2351,6 +2351,7 @@ libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev)
+@@ -2335,6 +2335,7 @@ libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev)
      pcidev->dev = pcisrc->addr.slot;
      pcidev->func = pcisrc->addr.function;
      pcidev->permissive = hostdev->writeFiltering == VIR_TRISTATE_BOOL_NO;
@@ -80,10 +84,10 @@ index f89f2dd978..aa2062bef3 100644
      if (hostdev->nostrictreset)
          pcidev->rdm_policy = LIBXL_RDM_RESERVE_POLICY_RELAXED;
 diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
-index 6918a4b121..dcb01b2b52 100644
+index 3a64f565f7..28dde9056f 100644
 --- a/src/libxl/xen_common.c
 +++ b/src/libxl/xen_common.c
-@@ -380,6 +380,7 @@ xenParsePCI(char *entry)
+@@ -382,6 +382,7 @@ xenParsePCI(char *entry)
      int slot;
      int func;
      virTristateBool filtered = VIR_TRISTATE_BOOL_ABSENT;
@@ -91,7 +95,7 @@ index 6918a4b121..dcb01b2b52 100644
  
      /* pci=['00:1b.0','0000:00:13.0,permissive=1'] */
      if (!(tokens = g_strsplit(entry, ":", 3)))
-@@ -440,6 +441,14 @@ xenParsePCI(char *entry)
+@@ -442,6 +443,14 @@ xenParsePCI(char *entry)
                      return NULL;
                  filtered = intval ? VIR_TRISTATE_BOOL_NO : VIR_TRISTATE_BOOL_YES;
              }
@@ -106,7 +110,7 @@ index 6918a4b121..dcb01b2b52 100644
          }
      }
  
-@@ -448,6 +457,7 @@ xenParsePCI(char *entry)
+@@ -450,6 +459,7 @@ xenParsePCI(char *entry)
  
      hostdev->managed = false;
      hostdev->writeFiltering = filtered;
@@ -114,7 +118,7 @@ index 6918a4b121..dcb01b2b52 100644
      hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
      hostdev->source.subsys.u.pci.addr.domain = domain;
      hostdev->source.subsys.u.pci.addr.bus = bus;
-@@ -1751,6 +1761,7 @@ xenFormatPCI(virConf *conf, virDomainDef *def)
+@@ -1761,6 +1771,7 @@ xenFormatPCI(virConf *conf, virDomainDef *def)
              virConfValue *tmp;
              char *buf;
              const char *permissive_str = NULL;
@@ -122,7 +126,7 @@ index 6918a4b121..dcb01b2b52 100644
  
              switch (def->hostdevs[i]->writeFiltering) {
                  case VIR_TRISTATE_BOOL_YES:
-@@ -1765,12 +1776,26 @@ xenFormatPCI(virConf *conf, virDomainDef *def)
+@@ -1775,12 +1786,26 @@ xenFormatPCI(virConf *conf, virDomainDef *def)
                      break;
              }
  
@@ -152,5 +156,5 @@ index 6918a4b121..dcb01b2b52 100644
  
              val = g_new0(virConfValue, 1);
 -- 
-2.41.0
+2.45.2
 
diff --git a/0017-Revert-meson-Replace-external_program.path-with-exte.patch b/0017-Revert-meson-Replace-external_program.path-with-exte.patch
deleted file mode 100644
index b3dc387..0000000
--- a/0017-Revert-meson-Replace-external_program.path-with-exte.patch
+++ /dev/null
@@ -1,365 +0,0 @@
-From 1fcdad74fc15ad1170430083210fd8c3f0b5ab38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Sun, 20 Nov 2022 01:14:37 +0100
-Subject: [PATCH] Revert "meson: Replace external_program.path() with
- external_program.full_path()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make it work temporarily with older meson.
-
-This reverts commit 27df3522e63a15bfd2d25be4340f4a38659400df.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- build-aux/meson.build   | 10 +++++-----
- docs/meson.build        |  8 ++++----
- meson.build             | 36 ++++++++++++++++++------------------
- src/access/meson.build  |  2 +-
- src/meson.build         | 22 +++++++++++-----------
- src/network/meson.build |  2 +-
- tests/meson.build       |  2 +-
- 7 files changed, 41 insertions(+), 41 deletions(-)
-
-diff --git a/build-aux/meson.build b/build-aux/meson.build
-index 3784b7cc3f..6017f07c0a 100644
---- a/build-aux/meson.build
-+++ b/build-aux/meson.build
-@@ -1,6 +1,6 @@
- flake8_path = ''
- if flake8_prog.found()
--  flake8_path = flake8_prog.full_path()
-+  flake8_path = flake8_prog.path()
- endif
- 
- if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin'
-@@ -33,10 +33,10 @@ syntax_check_conf = configuration_data({
-   'top_builddir': meson.project_build_root(),
-   'flake8_path': flake8_path,
-   'runutf8': ' '.join(runutf8),
--  'PYTHON3': python3_prog.full_path(),
--  'GREP': grep_prog.full_path(),
--  'SED': sed_prog.full_path(),
--  'AWK': awk_prog.full_path(),
-+  'PYTHON3': python3_prog.path(),
-+  'GREP': grep_prog.path(),
-+  'SED': sed_prog.path(),
-+  'AWK': awk_prog.path(),
- })
- 
- configure_file(
-diff --git a/docs/meson.build b/docs/meson.build
-index 7bae5c1481..2b292b1a5a 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -129,7 +129,7 @@ aclperms_gen = custom_target(
- )
- 
- docs_timestamp = run_command(
--  python3_prog, meson_timestamp_prog.full_path(), env: runutf8, check: true,
-+  python3_prog, meson_timestamp_prog.path(), env: runutf8, check: true,
- ).stdout().strip()
- 
- site_xsl = files('site.xsl')
-@@ -175,7 +175,7 @@ docs_programs_groups = [
- foreach item : docs_programs_groups
-   prog = find_program(item.get('prog'), dirs: libvirt_sbin_path)
-   varname = item.get('name').underscorify()
--  conf.set_quoted(varname.to_upper(), prog.full_path())
-+  conf.set_quoted(varname.to_upper(), prog.path())
-   set_variable('@0@_prog'.format(varname), prog)
- endforeach
- 
-@@ -348,7 +348,7 @@ endforeach
- run_target(
-   'install-web',
-   command: [
--    meson_python_prog, python3_prog.full_path(), meson_install_web_prog.full_path(),
-+    meson_python_prog, python3_prog.path(), meson_install_web_prog.path(),
-     install_web_files,
-   ],
-   depends: install_web_deps,
-@@ -358,7 +358,7 @@ test(
-   'check-html-references',
-   python3_prog,
-   args: [
--    check_html_references_prog.full_path(),
-+    check_html_references_prog.path(),
-     '--prefix',
-     meson.project_build_root() / 'docs'
-   ],
-diff --git a/meson.build b/meson.build
-index 5f913d89d1..4d73040b36 100644
---- a/meson.build
-+++ b/meson.build
-@@ -798,14 +798,14 @@ endif
- foreach name : required_programs
-   prog = find_program(name, dirs: libvirt_sbin_path)
-   varname = name.underscorify()
--  conf.set_quoted(varname.to_upper(), prog.full_path())
-+  conf.set_quoted(varname.to_upper(), prog.path())
-   set_variable('@0@_prog'.format(varname), prog)
- endforeach
- 
- foreach item : required_programs_groups
-   prog = find_program(item.get('prog'), dirs: libvirt_sbin_path)
-   varname = item.get('name').underscorify()
--  conf.set_quoted(varname.to_upper(), prog.full_path())
-+  conf.set_quoted(varname.to_upper(), prog.path())
-   set_variable('@0@_prog'.format(varname), prog)
- endforeach
- 
-@@ -835,7 +835,7 @@ foreach name : optional_programs
-   prog = find_program(name, required: false, dirs: libvirt_sbin_path)
-   varname = name.underscorify()
-   if prog.found()
--    prog_path = prog.full_path()
-+    prog_path = prog.path()
-   else
-     prog_path = name
-   endif
-@@ -1446,9 +1446,9 @@ if not get_option('driver_bhyve').disabled() and host_machine.system() == 'freeb
- 
-   if bhyve_prog.found() and bhyvectl_prog.found() and bhyveload_prog.found()
-     conf.set('WITH_BHYVE', 1)
--    conf.set_quoted('BHYVE', bhyve_prog.full_path())
--    conf.set_quoted('BHYVECTL', bhyvectl_prog.full_path())
--    conf.set_quoted('BHYVELOAD', bhyveload_prog.full_path())
-+    conf.set_quoted('BHYVE', bhyve_prog.path())
-+    conf.set_quoted('BHYVECTL', bhyvectl_prog.path())
-+    conf.set_quoted('BHYVELOAD', bhyveload_prog.path())
-   endif
- elif get_option('driver_bhyve').enabled()
-   error('The bhyve driver cannot be enabled')
-@@ -1690,7 +1690,7 @@ if not get_option('driver_qemu').disabled()
-       required: false
-     )
-     if qemu_bridge_prog.found()
--      qemu_bridge_path = qemu_bridge_prog.full_path()
-+      qemu_bridge_path = qemu_bridge_prog.path()
-     else
-       qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
-     endif
-@@ -1702,7 +1702,7 @@ if not get_option('driver_qemu').disabled()
-       required: false
-     )
-     if qemu_pr_prog.found()
--      qemu_pr_path = qemu_pr_prog.full_path()
-+      qemu_pr_path = qemu_pr_prog.path()
-     else
-       qemu_pr_path = '/usr/bin/qemu-pr-helper'
-     endif
-@@ -1714,7 +1714,7 @@ if not get_option('driver_qemu').disabled()
-       required: false
-     )
-     if qemu_slirp_prog.found()
--      qemu_slirp_path = qemu_slirp_prog.full_path()
-+      qemu_slirp_path = qemu_slirp_prog.path()
-     else
-       qemu_slirp_path = '/usr/bin/slirp-helper'
-     endif
-@@ -1726,7 +1726,7 @@ if not get_option('driver_qemu').disabled()
-       required: false
-     )
-     if qemu_dbus_daemon_prog.found()
--      qemu_dbus_daemon_path = qemu_dbus_daemon_prog.full_path()
-+      qemu_dbus_daemon_path = qemu_dbus_daemon_prog.path()
-     else
-       qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
-     endif
-@@ -1822,14 +1822,14 @@ if conf.has('WITH_LIBVIRTD')
-       use_storage = true
- 
-       conf.set('WITH_STORAGE_FS', 1)
--      conf.set_quoted('MOUNT', mount_prog.full_path())
--      conf.set_quoted('UMOUNT', umount_prog.full_path())
--      conf.set_quoted('MKFS', mkfs_prog.full_path())
-+      conf.set_quoted('MOUNT', mount_prog.path())
-+      conf.set_quoted('UMOUNT', umount_prog.path())
-+      conf.set_quoted('MKFS', mkfs_prog.path())
- 
-       showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path)
-       showmount_path = ''
-       if showmount_prog.found()
--        showmount_path = showmount_prog.full_path()
-+        showmount_path = showmount_prog.path()
-       endif
-       conf.set_quoted('SHOWMOUNT', showmount_path)
-     endif
-@@ -1879,7 +1879,7 @@ if conf.has('WITH_LIBVIRTD')
-       conf.set('WITH_STORAGE_LVM', 1)
- 
-       foreach name : lvm_progs
--        conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(name)).full_path())
-+        conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(name)).path())
-       endforeach
-     endif
-   endif
-@@ -2033,7 +2033,7 @@ if not get_option('numad').disabled() and numactl_dep.found()
-   numad_prog = find_program('numad', required: get_option('numad'), dirs: libvirt_sbin_path)
-   if numad_prog.found()
-     conf.set('WITH_NUMAD', 1)
--    conf.set_quoted('NUMAD', numad_prog.full_path())
-+    conf.set_quoted('NUMAD', numad_prog.path())
-   endif
- elif get_option('numad').enabled()
-   error('You must have numactl enabled for numad support.')
-@@ -2148,7 +2148,7 @@ if git
-     configuration: spec_conf,
-   )
- 
--  authors = run_command(python3_prog, meson_gen_authors_prog.full_path(),
-+  authors = run_command(python3_prog, meson_gen_authors_prog.path(),
-                         env: runutf8, check: true)
-   authors_file = 'AUTHORS.rst.in'
- 
-@@ -2170,7 +2170,7 @@ if git
- 
-   foreach file : dist_files
-     meson.add_dist_script(
--      meson_python_prog.full_path(), python3_prog.full_path(), meson_dist_prog.full_path(),
-+      meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(),
-       meson.project_build_root(), file
-     )
-   endforeach
-diff --git a/src/access/meson.build b/src/access/meson.build
-index dba08a6e87..36aff6fd88 100644
---- a/src/access/meson.build
-+++ b/src/access/meson.build
-@@ -120,6 +120,6 @@ generated_sym_files += access_gen_sym
- test(
-   'check-aclperms',
-   python3_prog,
--  args: [ check_aclperms_prog.full_path(), access_perm_h, files('viraccessperm.c') ],
-+  args: [ check_aclperms_prog.path(), access_perm_h, files('viraccessperm.c') ],
-   env: runutf8,
- )
-diff --git a/src/meson.build b/src/meson.build
-index 53c6c596a7..8000796733 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -909,7 +909,7 @@ virt_install_dirs += [
- ]
- 
- meson.add_install_script(
--  meson_python_prog.full_path(), python3_prog.full_path(), meson_install_dirs_prog.full_path(),
-+  meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(),
-   virt_install_dirs,
- )
- 
-@@ -920,7 +920,7 @@ if host_machine.system() == 'linux'
-   test(
-     'check-symfile',
-     python3_prog,
--    args: [ check_symfile_prog.full_path(), libvirt_syms, libvirt_lib ],
-+    args: [ check_symfile_prog.path(), libvirt_syms, libvirt_lib ],
-     env: runutf8,
-   )
- 
-@@ -928,7 +928,7 @@ if host_machine.system() == 'linux'
-     test(
-       'check-admin-symfile',
-       python3_prog,
--      args: [ check_symfile_prog.full_path(), libvirt_admin_syms, libvirt_admin_lib ],
-+      args: [ check_symfile_prog.path(), libvirt_admin_syms, libvirt_admin_lib ],
-       env: runutf8,
-     )
-   endif
-@@ -938,7 +938,7 @@ test(
-   'check-symsorting',
-   python3_prog,
-   args: [
--    check_symsorting_prog.full_path(),
-+    check_symsorting_prog.path(),
-     meson.current_source_dir(),
-     files(sym_files, used_sym_files),
-   ],
-@@ -949,7 +949,7 @@ test(
-   'check-admin-symsorting',
-   python3_prog,
-   args: [
--    check_symsorting_prog.full_path(),
-+    check_symsorting_prog.path(),
-     meson.current_source_dir(),
-     libvirt_admin_private_syms,
-   ],
-@@ -960,7 +960,7 @@ test(
-   'check-drivername',
-   python3_prog,
-   args: [
--    check_drivername_prog.full_path(), files(driver_headers),
-+    check_drivername_prog.path(), files(driver_headers),
-     files('libvirt_public.syms'), libvirt_qemu_syms, libvirt_lxc_syms,
-   ],
-   env: runutf8,
-@@ -970,7 +970,7 @@ test(
-   'check-admin-drivername',
-   python3_prog,
-   args: [
--    check_drivername_prog.full_path(), libvirt_admin_public_syms,
-+    check_drivername_prog.path(), libvirt_admin_public_syms,
-   ],
-   env: runutf8,
- )
-@@ -978,14 +978,14 @@ test(
- test(
-   'check-driverimpls',
-   python3_prog,
--  args: [ check_driverimpls_prog.full_path(), driver_source_files ],
-+  args: [ check_driverimpls_prog.path(), driver_source_files ],
-   env: runutf8,
- )
- 
- test(
-   'check-aclrules',
-   python3_prog,
--  args: [ check_aclrules_prog.full_path(), files('remote/remote_protocol.x'), stateful_driver_source_files ],
-+  args: [ check_aclrules_prog.path(), files('remote/remote_protocol.x'), stateful_driver_source_files ],
-   env: runutf8,
- )
- 
-@@ -1010,11 +1010,11 @@ if pdwtags_prog.found() and cc.get_id() != 'clang'
-       'check-@0@'.format(proto['name']),
-       python3_prog,
-       args: [
--        check_remote_protocol_prog.full_path(),
-+        check_remote_protocol_prog.path(),
-         proto['name'],
-         lib.name(),
-         lib.full_path(),
--        pdwtags_prog.full_path(),
-+        pdwtags_prog.path(),
-         files('@0@-structs'.format(proto['name'])),
-       ],
-       env: runutf8,
-diff --git a/src/network/meson.build b/src/network/meson.build
-index d5f9ba2254..395074a0a0 100644
---- a/src/network/meson.build
-+++ b/src/network/meson.build
-@@ -90,7 +90,7 @@ if conf.has('WITH_NETWORK')
-   )
- 
-   meson.add_install_script(
--    meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(),
-+    meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
-     confdir / 'qemu' / 'networks' / 'autostart',
-     '../default.xml', 'default.xml',
-   )
-diff --git a/tests/meson.build b/tests/meson.build
-index 8e7dc0cbfb..3819eb8ba9 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -700,7 +700,7 @@ testenv += 'VIR_TEST_FILE_ACCESS=1'
- add_test_setup(
-   'access',
-   env: testenv,
--  exe_wrapper: [ python3_prog, check_file_access_prog.full_path() ],
-+  exe_wrapper: [ python3_prog, check_file_access_prog.path() ],
- )
- 
- add_test_setup(
--- 
-2.37.3
-
diff --git a/0018-Revert-meson-Replace-meson.build_root-with-meson.pro.patch b/0018-Revert-meson-Replace-meson.build_root-with-meson.pro.patch
deleted file mode 100644
index 92978e6..0000000
--- a/0018-Revert-meson-Replace-meson.build_root-with-meson.pro.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-From dd4b508adc6cb983cd3c9c1f90dbe1f1a8cf4aeb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Sun, 20 Nov 2022 01:14:51 +0100
-Subject: [PATCH] Revert "meson: Replace meson.build_root() with
- meson.project_build_root()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make it work temporarily with older meson.
-
-This reverts commit 5ecdcf85416c51c8fbbf4c79a72ad219854b039e.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- build-aux/meson.build            | 2 +-
- docs/go/meson.build              | 2 +-
- docs/html/meson.build            | 4 ++--
- docs/kbase/internals/meson.build | 2 +-
- docs/kbase/meson.build           | 2 +-
- docs/manpages/meson.build        | 2 +-
- docs/meson.build                 | 6 +++---
- meson.build                      | 8 ++++----
- po/meson.build                   | 2 +-
- src/esx/meson.build              | 4 ++--
- src/hyperv/meson.build           | 2 +-
- src/meson.build                  | 4 ++--
- tests/meson.build                | 4 ++--
- 13 files changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/build-aux/meson.build b/build-aux/meson.build
-index 6017f07c0a..fcd231a386 100644
---- a/build-aux/meson.build
-+++ b/build-aux/meson.build
-@@ -30,7 +30,7 @@ awk_prog = find_program('awk')
- 
- syntax_check_conf = configuration_data({
-   'top_srcdir': meson.source_root(),
--  'top_builddir': meson.project_build_root(),
-+  'top_builddir': meson.build_root(),
-   'flake8_path': flake8_path,
-   'runutf8': ' '.join(runutf8),
-   'PYTHON3': python3_prog.path(),
-diff --git a/docs/go/meson.build b/docs/go/meson.build
-index 29467c61f0..c0e19c4182 100644
---- a/docs/go/meson.build
-+++ b/docs/go/meson.build
-@@ -31,7 +31,7 @@ foreach data : html_xslt_gen
-     command: [
-       xsltproc_prog,
-       '--stringparam', 'pagesrc', data.get('source', ''),
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'href_base', data.get('href_base', ''),
-       '--nonet',
-diff --git a/docs/html/meson.build b/docs/html/meson.build
-index b0ca400d08..e194b5942c 100644
---- a/docs/html/meson.build
-+++ b/docs/html/meson.build
-@@ -39,7 +39,7 @@ index_api_gen = custom_target(
-   ],
-   command: [
-     xsltproc_prog, '--nonet', '-o', docs_builddir,
--    '--stringparam', 'builddir', meson.project_build_root(),
-+    '--stringparam', 'builddir', meson.build_root(),
-     '--stringparam', 'timestamp', docs_timestamp,
-     '@INPUT@',
-   ],
-@@ -66,7 +66,7 @@ foreach name : [ 'admin', 'lxc', 'qemu' ]
-     ],
-     command: [
-       xsltproc_prog, '--nonet', '-o', docs_builddir,
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'indexfile', 'index-@0@.html'.format(name),
-       '@INPUT@',
-diff --git a/docs/kbase/internals/meson.build b/docs/kbase/internals/meson.build
-index f1e9122f8f..a16d5a290b 100644
---- a/docs/kbase/internals/meson.build
-+++ b/docs/kbase/internals/meson.build
-@@ -40,7 +40,7 @@ foreach data : html_xslt_gen
-     command: [
-       xsltproc_prog,
-       '--stringparam', 'pagesrc', data.get('source', ''),
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'href_base', data.get('href_base', ''),
-       '--nonet',
-diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
-index 5b608293e2..c7eae3738f 100644
---- a/docs/kbase/meson.build
-+++ b/docs/kbase/meson.build
-@@ -50,7 +50,7 @@ foreach data : html_xslt_gen
-     command: [
-       xsltproc_prog,
-       '--stringparam', 'pagesrc', data.get('source', ''),
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'href_base', data.get('href_base', ''),
-       '--nonet',
-diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
-index b5556996a4..83933227d9 100644
---- a/docs/manpages/meson.build
-+++ b/docs/manpages/meson.build
-@@ -148,7 +148,7 @@ foreach data : html_xslt_gen
-     command: [
-       xsltproc_prog,
-       '--stringparam', 'pagesrc', data.get('source', ''),
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'href_base', data.get('href_base', ''),
-       '--nonet',
-diff --git a/docs/meson.build b/docs/meson.build
-index 2b292b1a5a..39c60f9034 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -264,7 +264,7 @@ hvsupport_html_in = custom_target(
-     python3_prog,
-     hvsupport_prog,
-     meson.source_root(),
--    meson.project_build_root(),
-+    meson.build_root(),
-   ],
-   capture: true,
-   depend_files: [
-@@ -305,7 +305,7 @@ foreach data : html_xslt_gen
-     command: [
-       xsltproc_prog,
-       '--stringparam', 'pagesrc', data.get('source', ''),
--      '--stringparam', 'builddir', meson.project_build_root(),
-+      '--stringparam', 'builddir', meson.build_root(),
-       '--stringparam', 'timestamp', docs_timestamp,
-       '--stringparam', 'href_base', data.get('href_base', ''),
-       '--nonet',
-@@ -360,7 +360,7 @@ test(
-   args: [
-     check_html_references_prog.path(),
-     '--prefix',
--    meson.project_build_root() / 'docs'
-+    meson.build_root() / 'docs'
-   ],
-   env: runutf8,
- )
-diff --git a/meson.build b/meson.build
-index 4d73040b36..306cc9a7fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,7 +26,7 @@ endif
- conf = configuration_data()
- 
- conf.set('_GNU_SOURCE', 1)
--conf.set_quoted('abs_top_builddir', meson.project_build_root())
-+conf.set_quoted('abs_top_builddir', meson.build_root())
- conf.set_quoted('abs_top_srcdir', meson.source_root())
- conf.set_quoted('PACKAGE', meson.project_name())
- conf.set_quoted('PACKAGE_NAME', meson.project_name())
-@@ -2171,7 +2171,7 @@ if git
-   foreach file : dist_files
-     meson.add_dist_script(
-       meson_python_prog.path(), python3_prog.path(), meson_dist_prog.path(),
--      meson.project_build_root(), file
-+      meson.build_root(), file
-     )
-   endforeach
- endif
-@@ -2183,8 +2183,8 @@ configure_file(output: 'meson-config.h', configuration: conf)
- 
- # generate run helper
- run_conf = configuration_data({
--  'abs_builddir': meson.project_build_root(),
--  'abs_top_builddir': meson.project_build_root(),
-+  'abs_builddir': meson.build_root(),
-+  'abs_top_builddir': meson.build_root(),
- })
- 
- configure_file(
-diff --git a/po/meson.build b/po/meson.build
-index 0f2a1bb617..f5d05e2b31 100644
---- a/po/meson.build
-+++ b/po/meson.build
-@@ -8,7 +8,7 @@ i18n.gettext(
-     '--keyword=N_',
-     '--add-comments=TRANSLATORS:',
-     '--directory=@0@'.format(meson.source_root()),
--    '--directory=@0@'.format(meson.project_build_root()),
-+    '--directory=@0@'.format(meson.build_root()),
-     '--files-from=@0@'.format(meson.current_source_dir() / 'POTFILES'),
-     '--msgid-bugs-address=https://libvirt.org/bugs.html',
-     '--package-version=@0@'.format(meson.project_version()),
-diff --git a/src/esx/meson.build b/src/esx/meson.build
-index 2d05294ba1..5861e90afa 100644
---- a/src/esx/meson.build
-+++ b/src/esx/meson.build
-@@ -27,7 +27,7 @@ esx_gen_headers = custom_target(
-   command: [
-     meson_python_prog, python3_prog, esx_vi_generator_prog,
-     meson.source_root() / 'src',
--    meson.project_build_root() / 'src',
-+    meson.build_root() / 'src',
-     'header',
-   ],
- )
-@@ -48,7 +48,7 @@ esx_gen_sources = custom_target(
-   command: [
-     meson_python_prog, python3_prog, esx_vi_generator_prog,
-     meson.source_root() / 'src',
--    meson.project_build_root() / 'src',
-+    meson.build_root() / 'src',
-     'source',
-   ],
- )
-diff --git a/src/hyperv/meson.build b/src/hyperv/meson.build
-index 2589fc5437..0f0cdb9e54 100644
---- a/src/hyperv/meson.build
-+++ b/src/hyperv/meson.build
-@@ -19,7 +19,7 @@ hyperv_gen_sources = custom_target(
-   command: [
-     meson_python_prog, python3_prog, hyperv_wmi_generator_prog,
-     meson.source_root() / 'src',
--    meson.project_build_root() / 'src',
-+    meson.build_root() / 'src',
-   ],
- )
- 
-diff --git a/src/meson.build b/src/meson.build
-index 8000796733..88a6f15760 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -3,7 +3,7 @@ src_inc_dir = include_directories('.')
- src_dep = declare_dependency(
-   compile_args: [
-     '-DIN_LIBVIRT',
--    '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
-+    '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
-     '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
-   ] + coverage_flags + win32_flags,
-   dependencies: [
-@@ -1032,7 +1032,7 @@ run_pkg_config_files = [
- 
- run_pkg_config_conf = configuration_data({
-   'VERSION': meson.project_version(),
--  'abs_top_builddir': meson.project_build_root(),
-+  'abs_top_builddir': meson.build_root(),
-   'abs_top_srcdir': meson.source_root(),
- })
- 
-diff --git a/tests/meson.build b/tests/meson.build
-index 3819eb8ba9..2556b71444 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -1,7 +1,7 @@
- tests_dep = declare_dependency(
-   compile_args: [
-     '-Dabs_builddir="@0@"'.format(meson.current_build_dir()),
--    '-Dabs_top_builddir="@0@"'.format(meson.project_build_root()),
-+    '-Dabs_top_builddir="@0@"'.format(meson.build_root()),
-     '-Dabs_srcdir="@0@"'.format(meson.current_source_dir()),
-     '-Dabs_top_srcdir="@0@"'.format(meson.source_root()),
-   ] + coverage_flags + cc_flags_relaxed_frame_limit,
-@@ -36,7 +36,7 @@ tests_dep = declare_dependency(
- tests_env = [
-   'abs_builddir=@0@'.format(meson.current_build_dir()),
-   'abs_srcdir=@0@'.format(meson.current_source_dir()),
--  'abs_top_builddir=@0@'.format(meson.project_build_root()),
-+  'abs_top_builddir=@0@'.format(meson.build_root()),
-   'abs_top_srcdir=@0@'.format(meson.source_root()),
-   'LC_ALL=C',
-   'LIBVIRT_AUTOSTART=0',
--- 
-2.37.3
-
diff --git a/0018-libxl-don-t-create-vkb-device-for-qubes-graphics-out.patch b/0018-libxl-don-t-create-vkb-device-for-qubes-graphics-out.patch
new file mode 100644
index 0000000..50f286b
--- /dev/null
+++ b/0018-libxl-don-t-create-vkb-device-for-qubes-graphics-out.patch
@@ -0,0 +1,51 @@
+From 99f18f4f033ab3087e3147305e38d53ff545b291 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Sat, 13 Jul 2024 23:56:29 +0200
+Subject: [PATCH] libxl: don't create vkb device for qubes graphics output
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Qubes handles HID on its own, it doesn't use vkb device.
+
+Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+---
+ src/libxl/libxl_conf.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
+index 96d6e68472..c368dc4f4a 100644
+--- a/src/libxl/libxl_conf.c
++++ b/src/libxl/libxl_conf.c
+@@ -1627,6 +1627,7 @@ libxlMakeVfbList(virPortAllocatorRange *graphicsports,
+ {
+     virDomainGraphicsDef **l_vfbs = def->graphics;
+     int nvfbs = def->ngraphics;
++    int nvkbs = 0;
+     libxl_device_vfb *x_vfbs;
+     libxl_device_vkb *x_vkbs;
+     size_t i;
+@@ -1638,7 +1639,8 @@ libxlMakeVfbList(virPortAllocatorRange *graphicsports,
+     x_vkbs = g_new0(libxl_device_vkb, nvfbs);
+ 
+     for (i = 0; i < nvfbs; i++) {
+-        libxl_device_vkb_init(&x_vkbs[i]);
++        if (l_vfbs[i]->type != VIR_DOMAIN_GRAPHICS_TYPE_QUBES)
++            libxl_device_vkb_init(&x_vkbs[nvkbs++]);
+ 
+         if (libxlMakeVfb(graphicsports, l_vfbs[i], &x_vfbs[i]) < 0)
+             goto error;
+@@ -1646,7 +1648,8 @@ libxlMakeVfbList(virPortAllocatorRange *graphicsports,
+ 
+     d_config->vfbs = x_vfbs;
+     d_config->vkbs = x_vkbs;
+-    d_config->num_vfbs = d_config->num_vkbs = nvfbs;
++    d_config->num_vfbs = nvfbs;
++    d_config->num_vkbs = nvkbs;
+ 
+     return 0;
+ 
+-- 
+2.45.2
+
diff --git a/0019-Revert-meson-Bump-minimal-required-meson-version.patch b/0019-Revert-meson-Bump-minimal-required-meson-version.patch
deleted file mode 100644
index ac33f98..0000000
--- a/0019-Revert-meson-Bump-minimal-required-meson-version.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 5bbe06e8160d7d78f05e420fec2be1164710545f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Sun, 20 Nov 2022 01:15:06 +0100
-Subject: [PATCH] Revert "meson: Bump minimal required meson version"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Make it work temporarily with older meson.
-
-This reverts commit 14573868ea7b8df716f80be6a0a00584954e5693.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- libvirt.spec.in | 2 +-
- meson.build     | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index d946a8da48..93329350e6 100644
---- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -271,7 +271,7 @@ Requires: libvirt-libs = %{version}-%{release}
- # listed against each sub-RPM
- BuildRequires: python3-docutils
- BuildRequires: gcc
--BuildRequires: meson >= 0.56.0
-+BuildRequires: meson >= 0.54.0
- BuildRequires: ninja-build
- BuildRequires: git
- BuildRequires: perl-interpreter
-diff --git a/meson.build b/meson.build
-index 306cc9a7fd..c622eed3e6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2,7 +2,7 @@ project(
-   'libvirt', 'c',
-   version: '8.9.0',
-   license: 'LGPLv2+',
--  meson_version: '>= 0.56.0',
-+  meson_version: '>= 0.54.0',
-   default_options: [
-     'buildtype=debugoptimized',
-     'b_pie=true',
--- 
-2.37.3
-
diff --git a/0020-libxl-adjust-ich6-sound-card-name.patch b/0020-libxl-adjust-ich6-sound-card-name.patch
deleted file mode 100644
index eee5810..0000000
--- a/0020-libxl-adjust-ich6-sound-card-name.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 071dcab02e16adf6e91b4c606cae61bc41e88d49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
- <marmarek@invisiblethingslab.com>
-Date: Wed, 14 Dec 2022 14:51:45 +0100
-Subject: [PATCH] libxl: adjust 'ich6' sound card name
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Xen 4.17 has strict parsing of 'soundhw' option that allows only
-specific values (instead of passing through any value directly to qemu).
-For 'intel-hda' audio device, it requires "hda" string. "hda" works with
-older libxl too. Other supported models are the same as in libvirt XML.
-
-Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
----
- src/libxl/libxl_conf.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
-index 85abe92e3c..fef19e6ace 100644
---- a/src/libxl/libxl_conf.c
-+++ b/src/libxl/libxl_conf.c
-@@ -596,7 +596,26 @@ libxlMakeDomBuildInfo(virDomainDef *def,
-              */
-             virDomainSoundDef *snd = def->sounds[0];
- 
--            b_info->u.hvm.soundhw = g_strdup(virDomainSoundModelTypeToString(snd->model));
-+            switch (snd->model) {
-+                case VIR_DOMAIN_SOUND_MODEL_ICH6:
-+                    b_info->u.hvm.soundhw = g_strdup("hda");
-+                    break;
-+                case VIR_DOMAIN_SOUND_MODEL_ES1370:
-+                case VIR_DOMAIN_SOUND_MODEL_AC97:
-+                case VIR_DOMAIN_SOUND_MODEL_SB16:
-+                    b_info->u.hvm.soundhw = g_strdup(virDomainSoundModelTypeToString(snd->model));
-+                    break;
-+                default:
-+                case VIR_DOMAIN_SOUND_MODEL_PCSPK:
-+                case VIR_DOMAIN_SOUND_MODEL_ICH7:
-+                case VIR_DOMAIN_SOUND_MODEL_USB:
-+                case VIR_DOMAIN_SOUND_MODEL_ICH9:
-+                case VIR_DOMAIN_SOUND_MODEL_LAST:
-+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                            _("unsupported audio model %s"),
-+                            virDomainSoundModelTypeToString(snd->model));
-+                    return -1;
-+            }
-         }
- 
-         for (i = 0; i < def->os.nBootDevs; i++) {
--- 
-2.37.3
-
diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in
index efff086..1f43749 100644
--- a/libvirt-python.spec.in
+++ b/libvirt-python.spec.in
@@ -4,7 +4,7 @@
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward
 %define min_rhel 8
-%define min_fedora 32
+%define min_fedora 33
 
 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel})
     %define supported_platform 1
@@ -17,13 +17,14 @@ Name: libvirt-python
 Version: @VERSION@
 Release: @REL@%{?dist}
 Epoch: 1000
-Source0: %{name}-%{version}.tar.gz
+Source0: https://libvirt.org/sources/python/%{name}-%{version}.tar.gz
 Url: https://libvirt.org
-License: LGPLv2+
+License: LGPL-2.1-or-later
 BuildRequires: libvirt-devel == %{epoch}:%{version}
 BuildRequires: python3-devel
 BuildRequires: python3-pytest
 BuildRequires: python3-lxml
+BuildRequires: python3-setuptools
 BuildRequires: gcc
 
 # Don't want provides for python shared objects
@@ -70,10 +71,10 @@ exit 1
 %py3_install
 
 %check
-%{__python3} setup.py test
+%pytest
 
 %files -n python3-libvirt
-%doc ChangeLog AUTHORS README COPYING COPYING.LESSER examples/
+%doc ChangeLog AUTHORS README COPYING examples/
 %{python3_sitearch}/libvirt.py*
 %{python3_sitearch}/libvirtaio.py*
 %{python3_sitearch}/libvirt_qemu.py*
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 42dfb8e..dcd16a7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -4,7 +4,7 @@
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward.
 %define min_rhel 8
-%define min_fedora 32
+%define min_fedora 37
 
 %define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
 %if 0%{?rhel}
@@ -21,8 +21,8 @@
 %define arches_systemtap_64bit  %{arches_64bit}
 %define arches_dmidecode        %{arches_x86}
 %define arches_xen              %{arches_x86} aarch64
-%if 0%{?fedora} >= 36
-    %define arches_xen              x86_64 aarch64
+%if 0%{?fedora}
+    %define arches_xen          x86_64 aarch64
 %endif
 %define arches_vbox             %{arches_x86}
 %define arches_ceph             %{arches_64bit}
@@ -90,11 +90,15 @@
 
 # Other optional features
 %define with_numactl          0%{!?_without_numactl:1}
+%define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1}
 
 # A few optional bits off by default, we enable later
 %define with_fuse             0
 %define with_sanlock          0
 %define with_numad            0
+%define with_nbdkit           0
+%define with_nbdkit_config_default 0
+%define with_firewalld        0
 %define with_firewalld_zone   0
 %define with_netcf            0
 %define with_libssh2          0
@@ -128,17 +132,15 @@
     %define with_vmware 0
     %define with_libxl 0
     %define with_hyperv 0
-    %define with_vz 0
     %define with_lxc 0
 %endif
 
 %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 
-%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)
+%if 0%{?rhel} && 0%{?rhel} < 9
     %define with_netcf 0%{!?_without_netcf:1}
 %endif
 
-
 # fuse is used to provide virtualized /proc for LXC
 %if %{with_lxc}
     %define with_fuse      0%{!?_without_fuse:1}
@@ -175,15 +177,85 @@
     %endif
 %endif
 
+# We want to build with nbdkit support, but should only enable nbdkit by
+# default if the OS ships a SELinux policy that allows libvirt to launch it.
+# Right now that's not the case anywhere, but things should be fine by the time
+# Fedora 40 is released.
+%if %{with_qemu}
+    # rhel-8 lacks pidfd_open
+    %if 0%{?fedora} || 0%{?rhel} >= 9
+        %define with_nbdkit 0%{!?_without_nbdkit:1}
+
+        # setting 'with_nbdkit_config_default' must be done only when compiling
+        # in nbdkit support
+        #
+        # TODO: add RHEL 9 once a minor release that contains the necessary SELinux
+        #       bits exists (we only support the most recent minor release)
+        %if 0%{?fedora} >= 40
+            %define with_nbdkit_config_default 0%{!?_without_nbdkit_config_default:1}
+        %endif
+    %endif
+%endif
+
 %ifarch %{arches_dmidecode}
     %define with_dmidecode 0%{!?_without_dmidecode:1}
 %endif
 
 %define with_modular_daemons 0
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
+%if 0%{?fedora} || 0%{?rhel} >= 9
     %define with_modular_daemons 1
 %endif
 
+# Force QEMU to run as non-root
+%define qemu_user  qemu
+%define qemu_group  qemu
+
+# Locations for QEMU data
+%define qemu_moddir %{_libdir}/qemu
+%define qemu_datadir %{_datadir}/qemu
+
+# Native / MinGW builds
+%define with_native 0%{!?_without_native:1}
+
+%define with_mingw32 0
+%define with_mingw64 0
+
+%if 0%{?fedora}
+    %if 0%{!?_without_mingw:1}
+        %define with_mingw32 0%{!?_without_mingw32:1}
+        %define with_mingw64 0%{!?_without_mingw64:1}
+    %endif
+
+    # These tell the other mingw macros whether to perform or
+    # skip the 32-bit and 64-bit specific steps respectively
+    %define mingw_build_win32 %{with_mingw32}
+    %define mingw_build_win64 %{with_mingw64}
+%endif
+
+%if !%{with_native}
+    # Building the debugsource package apparently only works if the
+    # native build is enabled. debuginfo packages don't have this
+    # problem and setting this doesn't disable them
+    %global debug_package %{nil}
+%endif
+
+# RHEL releases provide stable tool chains and so it is safe to turn
+# compiler warning into errors without being worried about frequent
+# changes in reported warnings
+%if 0%{?rhel}
+    %define enable_werror -Dwerror=true
+%else
+    %define enable_werror -Dwerror=false -Dgit_werror=disabled
+%endif
+
+# Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which
+# does not require enabling vm.unprivileged_userfaultfd sysctl.
+%if 0%{?fedora} || 0%{?rhel} >= 9
+    %define with_userfaultfd_sysctl 0
+%endif
+
+%define tls_priority "@LIBVIRT,SYSTEM"
+
 ### Qubes settings ####
 # Disable some drivers not used by Qubes (like network storage)
 %define with_storage_fs 0
@@ -198,6 +270,10 @@
 %define with_selinux 0
 %define with_xenapi 0
 %define with_polkit 0
+%define with_nbdkit 0
+%define with_nbdkit_config_default 0
+%define with_mingw32 0
+%define with_mingw64 0
 
 # Disabled by default to minimize dependencies, enable when adding support for
 # particular VMM, should be conditional on %%{backend_vmm}
@@ -224,27 +300,6 @@
 
 ### End of Qubes settings ####
 
-# Force QEMU to run as non-root
-%define qemu_user  qemu
-%define qemu_group  qemu
-
-# Locations for QEMU data
-%define qemu_moddir %{_libdir}/qemu
-%define qemu_datadir %{_datadir}/qemu
-
-%define with_mingw 0
-
-# RHEL releases provide stable tool chains and so it is safe to turn
-# compiler warning into errors without being worried about frequent
-# changes in reported warnings
-%if 0%{?rhel}
-    %define enable_werror -Dwerror=true
-%else
-    %define enable_werror -Dwerror=false -Dgit_werror=disabled
-%endif
-
-%define tls_priority "@LIBVIRT,SYSTEM"
-
 # libvirt 8.1.0 stops distributing any sysconfig files.
 # If the user has customized their sysconfig file,
 # the RPM upgrade path will rename it to .rpmsave
@@ -268,14 +323,14 @@ Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: @VERSION@
 Release: @REL@%{?dist}
-License: LGPLv2+
+License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 Epoch: 1000
 URL: https://libvirt.org/
 
-%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1
+%if %(echo %{version} | grep "\.0$" >/dev/null; echo $?) == 1
     %define mainturl stable_updates/
 %endif
-Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
+Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
 
 # patches
 Patch0001: 0001-conf-add-script-attribute-to-disk-specification.patch
@@ -292,15 +347,10 @@ Patch0011: 0011-libxl-add-support-for-emulator-kernel-and-ramdisk-pa.patch
 Patch0012: 0012-libxl-Fix-setting-invtsc-in-Xen-4.14.patch
 Patch0013: 0013-libxl-fail-with-distinct-error-on-unsupported-PM-sus.patch
 Patch0014: 0014-libxl-add-support-for-xengt-video-device.patch
-Patch0015: 0015-tests-Fix-libxlxml2domconfigtest.patch
-Patch0016: 0016-Revert-meson-Replace-meson.source_root-with-meson.pr.patch
-Patch0017: 0017-Revert-meson-Replace-external_program.path-with-exte.patch
-Patch0018: 0018-Revert-meson-Replace-meson.build_root-with-meson.pro.patch
-Patch0019: 0019-Revert-meson-Bump-minimal-required-meson-version.patch
-Patch0020: 0020-libxl-adjust-ich6-sound-card-name.patch
-Patch0021: 0021-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
-Patch0022: 0022-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
-Patch0023: 0023-Add-powerManagementFiltering-for-PCI-PM-control.patch
+Patch0015: 0015-libxl-set-net-disk-trusted-parameter-based-on-backen.patch
+Patch0016: 0016-libxl-setup-shadow-memory-according-to-max-hotplug-m.patch
+Patch0017: 0017-Add-powerManagementFiltering-for-PCI-PM-control.patch
+Patch0018: 0018-libxl-don-t-create-vkb-device-for-qubes-graphics-out.patch
 
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
 %if %{with_network}
@@ -315,6 +365,7 @@ Requires: libvirt-daemon-driver-lxc = %{epoch}:%{version}-%{release}
 %endif
 %if %{with_qemu}
 Requires: libvirt-daemon-driver-qemu = %{epoch}:%{version}-%{release}
+Requires: libvirt-client-qemu = %{epoch}:%{version}-%{release}
 %endif
 # We had UML driver, but we've removed it.
 Obsoletes: libvirt-daemon-driver-uml <= 5.0.0
@@ -337,22 +388,29 @@ Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 # All build-time requirements. Run-time requirements are
 # listed against each sub-RPM
 BuildRequires: python3-docutils
-BuildRequires: gcc
-#BuildRequires: meson >= 0.56.0
-BuildRequires: meson >= 0.54.0
+BuildRequires: meson >= 0.56.0
 BuildRequires: ninja-build
 BuildRequires: git
 BuildRequires: perl-interpreter
 BuildRequires: python3
-%if %{with_libxl}
+BuildRequires: python3-pytest
+# For xmllint
+BuildRequires: libxml2
+# For xsltproc
+BuildRequires: libxslt
+BuildRequires: gettext
+BuildRequires: systemd-rpm-macros
+# Fedora build root suckage
+BuildRequires: gawk
+%if %{with_native}
+BuildRequires: gcc
+    %if %{with_libxl}
 BuildRequires: xen-devel >= 2001:4.14.5-7
-%endif
+    %endif
 BuildRequires: glib2-devel >= 2.56
 BuildRequires: libxml2-devel
-BuildRequires: libxslt
 BuildRequires: readline-devel
-BuildRequires: bash-completion >= 2.0
-BuildRequires: gettext
+BuildRequires: pkgconfig(bash-completion) >= 2.0
 BuildRequires: libtasn1-devel
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
@@ -364,109 +422,100 @@ BuildRequires: systemd-devel >= 185
 BuildRequires: systemd-rpm-macros
 BuildRequires: libpciaccess-devel >= 0.10.9
 BuildRequires: yajl-devel
-%if %{with_sanlock}
+    %if %{with_sanlock}
 BuildRequires: sanlock-devel >= 2.4
-%endif
+    %endif
 BuildRequires: libpcap-devel >= 1.5.0
 BuildRequires: libnl3-devel
 BuildRequires: libselinux-devel
 BuildRequires: iptables
 BuildRequires: ebtables
-BuildRequires: module-init-tools
+# For modprobe
+BuildRequires: kmod
 BuildRequires: cyrus-sasl-devel
 BuildRequires: polkit >= 0.112
 # For mount/umount in FS driver
 BuildRequires: util-linux
-%if %{with_qemu}
+    %if %{with_qemu}
 # For managing ACLs
 BuildRequires: libacl-devel
 # From QEMU RPMs
 #BuildRequires: /usr/bin/qemu-img
-%endif
+    %endif
+# nbdkit support requires libnbd
+    %if %{with_nbdkit}
+BuildRequires: libnbd-devel
+    %endif
 # For LVM drivers
 BuildRequires: lvm2
 # For pool type=iscsi
 BuildRequires: iscsi-initiator-utils
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 # For pool type=iscsi-direct
 BuildRequires: libiscsi-devel
-%endif
+    %endif
 # For disk driver
 BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 BuildRequires: librados-devel
 BuildRequires: librbd-devel
-%endif
-%if %{with_storage_gluster}
+    %endif
+    %if %{with_storage_gluster}
 BuildRequires: glusterfs-api-devel >= 3.4.1
 BuildRequires: glusterfs-devel >= 3.4.1
-%endif
-%if %{with_numactl}
+    %endif
+    %if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
-%endif
+    %endif
 BuildRequires: libcap-ng-devel >= 0.5.0
-%if %{with_fuse}
+    %if %{with_fuse}
 BuildRequires: fuse-devel >= 2.8.6
-%endif
-%if %{with_libssh2}
+    %endif
+    %if %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
-%endif
-%if %{with_netcf}
+    %endif
+    %if %{with_netcf}
 BuildRequires: netcf-devel >= 0.2.2
-%endif
-%if %{with_esx}
+    %endif
+    %if %{with_esx}
 BuildRequires: libcurl-devel
-%endif
-%if %{with_hyperv}
+    %endif
+    %if %{with_hyperv}
 BuildRequires: libwsman-devel >= 2.6.3
-%endif
+    %endif
 BuildRequires: audit-libs-devel
-# we need /usr/sbin/dtrace
 BuildRequires: systemtap-sdt-devel
+# we need /usr/sbin/dtrace
+BuildRequires: systemtap-sdt-dtrace
 
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
-
-# Fedora build root suckage
-BuildRequires: gawk
-
-# For storage wiping with different algorithms
-BuildRequires: scrub
-
-%if %{with_numad}
+    %if %{with_numad}
 BuildRequires: numad
-%endif
-
-%if %{with_wireshark}
+    %endif
+    %if %{with_wireshark}
 BuildRequires: wireshark-devel
-%endif
-
-%if %{with_libssh}
+    %endif
+    %if %{with_libssh}
 BuildRequires: libssh-devel >= 0.8.1
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires: rpcgen
+    %endif
 BuildRequires: libtirpc-devel
-%endif
-
+    %if %{with_firewalld_zone}
 # Needed for the firewalld_reload macro
-%if %{with_firewalld_zone}
 BuildRequires: firewalld-filesystem
+    %endif
 %endif
 
-%if %{with_mingw}
+%if %{with_mingw32}
 BuildRequires: mingw32-filesystem
 BuildRequires: mingw32-gcc
 BuildRequires: mingw32-binutils
 BuildRequires: mingw32-glib2 >= 2.48
-BuildRequires: mingw32-libgpg-error
-BuildRequires: mingw32-libgcrypt
 BuildRequires: mingw32-gnutls
 BuildRequires: mingw32-gettext
 BuildRequires: mingw32-libxml2
@@ -474,13 +523,12 @@ BuildRequires: mingw32-portablexdr
 BuildRequires: mingw32-dlfcn
 BuildRequires: mingw32-libssh2
 BuildRequires: mingw32-curl
-
+%endif
+%if %{with_mingw64}
 BuildRequires: mingw64-filesystem
 BuildRequires: mingw64-gcc
 BuildRequires: mingw64-binutils
 BuildRequires: mingw64-glib2 >= 2.48
-BuildRequires: mingw64-libgpg-error
-BuildRequires: mingw64-libgcrypt
 BuildRequires: mingw64-gnutls
 BuildRequires: mingw64-gettext
 BuildRequires: mingw64-libxml2
@@ -495,6 +543,7 @@ Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
 the libvirtd server exporting the virtualization support.
 
+%if %{with_native}
 %package docs
 Summary: API reference and website documentation
 
@@ -509,51 +558,99 @@ Summary: Server side daemon and supporting files for libvirt library
 # for subpackages are listed later in those subpackages)
 
 # The client side, i.e. shared libs are in a subpackage
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-
-# (client invokes 'nc' against the UNIX socket on the server)
-Requires: /usr/bin/nc
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+#Requires: libvirt-daemon-lock = %{epoch}:%{version}-%{release}
+#Requires: libvirt-daemon-plugin-lockd = %{epoch}:%{version}-%{release}
+#Requires: libvirt-daemon-log = %{epoch}:%{version}-%{release}
+#Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
 
-# for modprobe of pci devices
-Requires: module-init-tools
+%description daemon
+Server side daemon required to manage the virtualization capabilities
+of recent versions of Linux. Requires a hypervisor specific sub-RPM
+for specific drivers.
 
-# for /sbin/ip & /sbin/tc
+%package daemon-common
+Summary: Files and utilities used by daemons
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+# The libvirt-guests.sh script requires virsh from libvirt-client subpackage,
+# but not every deployment wants to use libvirt-guests service. Using
+# Recommends here will install libvirt-client by default (if available), but
+# RPM won't complain if the package is unavailable, masked, or removed later.
+Recommends: libvirt-client = %{epoch}:%{version}-%{release}
+# for /sbin/ip
 Requires: iproute
-# tc is provided by iproute-tc since at least Fedora 26
-%if 0%{?fedora} || 0%{?rhel} > 7
+# for /sbin/tc
 Requires: iproute-tc
-%endif
-
 Requires: polkit >= 0.112
-%if %{with_dmidecode}
+    %if %{with_dmidecode}
 # For virConnectGetSysinfo
 Requires: dmidecode
-%endif
+    %endif
 # For service management
-Requires(post): /usr/bin/systemctl
-%if %{with_numad}
-Requires: numad
-%endif
+Requires(posttrans): /usr/bin/systemctl
+Requires(preun): /usr/bin/systemctl
 # libvirtd depends on 'messagebus' service
 Requires: dbus
 # For uid creation during pre
 Requires(pre): shadow-utils
+# Needed by /usr/libexec/libvirt-guests.sh script.
+    %if 0%{?fedora}
+Requires: gettext-runtime
+    %else
+Requires: gettext
+    %endif
 
 # Ensure smooth upgrades
 Obsoletes: libvirt-admin < 7.3.0
-Provides: libvirt-admin = %{version}-%{release}
+Provides: libvirt-admin = %{epoch}:%{version}-%{release}
 Obsoletes: libvirt-bash-completion < 7.3.0
 
-%description daemon
-Server side daemon required to manage the virtualization capabilities
-of recent versions of Linux. Requires a hypervisor specific sub-RPM
-for specific drivers.
+%description daemon-common
+Miscellaneous files and utilities used by other libvirt daemons
+
+%package daemon-lock
+Summary: Server side daemon for managing locks
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+
+%description daemon-lock
+Server side daemon used to manage locks held against virtual machine
+resources
+
+%package daemon-plugin-lockd
+Summary: lockd client plugin for virtlockd
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-lock = %{epoch}:%{version}-%{release}
+
+%description daemon-plugin-lockd
+A client-side plugin that implements disk locking using POSIX fcntl advisory
+locks via communication with the virtlockd daemon
+
+%package daemon-log
+Summary: Server side daemon for managing logs
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+
+%description daemon-log
+Server side daemon used to manage logs from virtual machine consoles
+
+%package daemon-proxy
+Summary: Server side daemon providing libvirtd proxy
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+# netcat is needed on the server side so that clients that have
+# libvirt < 6.9.0 can connect, but newer versions will prefer
+# virt-ssh-helper. Making this a Recommends means that it gets
+# installed by default, but can still be removed if compatibility
+# with old clients is not required
+Recommends: /usr/bin/nc
+
+%description daemon-proxy
+Server side daemon providing functionality previously provided by
+the monolithic libvirtd
 
 %if %{with_network}
 %package daemon-config-network
 Summary: Default configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
 
 %description daemon-config-network
@@ -563,7 +660,6 @@ Default configuration files for setting up NAT based networking
 %package daemon-config-nwfilter
 Summary: Network filter configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{epoch}:%{version}-%{release}
 
 %description daemon-config-nwfilter
@@ -572,10 +668,9 @@ Network filter configuration files for cleaning guest traffic
 %if %{with_network}
 %package daemon-driver-network
 Summary: Network driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: dnsmasq >= 2.41
-Requires: radvd
 Requires: iptables
 
 %description daemon-driver-network
@@ -587,7 +682,7 @@ bridge capabilities.
 
 %package daemon-driver-nwfilter
 Summary: Nwfilter driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: iptables
 Requires: ebtables
@@ -597,37 +692,38 @@ The nwfilter driver plugin for the libvirtd daemon, providing
 an implementation of the firewall APIs using the ebtables,
 iptables and ip6tables capabilities
 
-
 %package daemon-driver-nodedev
 Summary: Nodedev driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 # needed for device enumeration
 Requires: systemd >= 185
+# For managing persistent mediated devices
+# Note: for nodedev-update support at least mdevctl v1.3.0 is required
+Requires: mdevctl
+# for modprobe of pci devices
+Requires: module-init-tools
 
 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
 an implementation of the node device APIs using the udev
 capabilities.
 
-
 %package daemon-driver-interface
 Summary: Interface driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
-%if %{with_netcf}
+    %if %{with_netcf}
 Requires: netcf-libs >= 0.2.2
-%endif
+    %endif
 
 %description daemon-driver-interface
 The interface driver plugin for the libvirtd daemon, providing
-an implementation of the network interface APIs using the
-netcf library
-
+an implementation of the host network interface APIs.
 
 %package daemon-driver-secret
 Summary: Secret driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 
 %description daemon-driver-secret
@@ -636,18 +732,21 @@ an implementation of the secret key APIs.
 
 %package daemon-driver-storage-core
 Summary: Storage driver plugin including base backends for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: nfs-utils
 # For mkfs
 Requires: util-linux
-%if %{with_qemu}
+# For storage wiping with different algorithms
+Requires: scrub
+    %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
-%endif
-%if !%{with_storage_rbd}
-Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release}
-%endif
+    %endif
+    %if !%{with_storage_rbd}
+Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0
+    %endif
+Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0
 
 %description daemon-driver-storage-core
 The storage driver plugin for the libvirtd daemon, providing
@@ -664,7 +763,6 @@ Requires: lvm2
 The storage driver backend adding implementation of the storage APIs for block
 volumes using lvm.
 
-
 %package daemon-driver-storage-disk
 Summary: Storage driver plugin for disk
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
@@ -676,7 +774,6 @@ Requires: device-mapper
 The storage driver backend adding implementation of the storage APIs for block
 volumes using the host disks.
 
-
 %package daemon-driver-storage-scsi
 Summary: Storage driver plugin for local scsi devices
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
@@ -686,7 +783,6 @@ Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 The storage driver backend adding implementation of the storage APIs for scsi
 host devices.
 
-
 %package daemon-driver-storage-iscsi
 Summary: Storage driver plugin for iscsi
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
@@ -697,19 +793,16 @@ Requires: iscsi-initiator-utils
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using the host iscsi stack.
 
-
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 %package daemon-driver-storage-iscsi-direct
 Summary: Storage driver plugin for iscsi-direct
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
-Requires: libiscsi
 
 %description daemon-driver-storage-iscsi-direct
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using libiscsi direct connection.
-%endif
-
+    %endif
 
 %package daemon-driver-storage-mpath
 Summary: Storage driver plugin for multipath volumes
@@ -721,26 +814,24 @@ Requires: device-mapper
 The storage driver backend adding implementation of the storage APIs for
 multipath storage using device mapper.
 
-
-%if %{with_storage_gluster}
+    %if %{with_storage_gluster}
 %package daemon-driver-storage-gluster
 Summary: Storage driver plugin for gluster
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
-    %if 0%{?fedora}
+        %if 0%{?fedora}
 Requires: glusterfs-client >= 2.0.1
-    %endif
-    %if (0%{?fedora} || 0%{?with_storage_gluster})
+        %endif
+        %if 0%{?fedora} || 0%{?with_storage_gluster}
 Requires: /usr/sbin/gluster
-    %endif
+        %endif
 
 %description daemon-driver-storage-gluster
 The storage driver backend adding implementation of the storage APIs for gluster
 volumes using libgfapi.
-%endif
-
+    %endif
 
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 %package daemon-driver-storage-rbd
 Summary: Storage driver plugin for rbd
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
@@ -749,10 +840,9 @@ Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 %description daemon-driver-storage-rbd
 The storage driver backend adding implementation of the storage APIs for rbd
 volumes using the ceph protocol.
-%endif
-
+    %endif
 
-%if %{with_storage_zfs}
+    %if %{with_storage_zfs}
 %package daemon-driver-storage-zfs
 Summary: Storage driver plugin for ZFS
 Requires: libvirt-daemon-driver-storage-core = %{epoch}:%{version}-%{release}
@@ -764,8 +854,7 @@ Requires: /sbin/zpool
 %description daemon-driver-storage-zfs
 The storage driver backend adding implementation of the storage APIs for
 ZFS volumes.
-%endif
-
+    %endif
 
 %package daemon-driver-storage
 Summary: Storage driver plugin including all backends for the libvirtd daemon
@@ -775,29 +864,29 @@ Requires: libvirt-daemon-driver-storage-logical = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-storage-scsi = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-storage-iscsi = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-storage-mpath = %{epoch}:%{version}-%{release}
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 Requires: libvirt-daemon-driver-storage-iscsi-direct = %{epoch}:%{version}-%{release}
-%endif
-%if %{with_storage_gluster}
+    %endif
+    %if %{with_storage_gluster}
 Requires: libvirt-daemon-driver-storage-gluster = %{epoch}:%{version}-%{release}
-%endif
-%if %{with_storage_rbd}
+    %endif
+    %if %{with_storage_rbd}
 Requires: libvirt-daemon-driver-storage-rbd = %{epoch}:%{version}-%{release}
-%endif
-%if %{with_storage_zfs}
+    %endif
+    %if %{with_storage_zfs}
 Requires: libvirt-daemon-driver-storage-zfs = %{epoch}:%{version}-%{release}
-%endif
+    %endif
 
 %description daemon-driver-storage
 The storage driver plugin for the libvirtd daemon, providing
 an implementation of the storage APIs using LVM, iSCSI,
 parted and more.
 
-
-%if %{with_qemu}
+    %if %{with_qemu}
 %package daemon-driver-qemu
 Summary: QEMU driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-log = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: /usr/bin/qemu-img
 # For image compression
@@ -807,49 +896,63 @@ Requires: lzop
 Requires: xz
 Requires: systemd-container
 Requires: swtpm-tools
+        %if %{with_numad}
+Requires: numad
+        %endif
+        %if 0%{?fedora} || 0%{?rhel} >= 9
+Recommends: passt
+Recommends: passt-selinux
+        %endif
+        %if %{with_nbdkit}
+Recommends: nbdkit
+Recommends: nbdkit-curl-plugin
+Recommends: nbdkit-ssh-plugin
+        %endif
 
 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 QEMU
-%endif
-
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package daemon-driver-lxc
 Summary: LXC driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 # There really is a hard cross-driver dependency here
-%if %{with_network}
+    %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+    %endif
 Requires: systemd-container
+# for modprobe of nbd driver
+Requires: module-init-tools
+        %if %{with_numad}
+Requires: numad
+        %endif
 
 %description daemon-driver-lxc
 The LXC driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 the Linux kernel
-%endif
-
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %package daemon-driver-vbox
 Summary: VirtualBox driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 
 %description daemon-driver-vbox
 The vbox driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 VirtualBox
-%endif
-
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %package daemon-driver-libxl
 Summary: Libxl driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
 Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Obsoletes: libvirt-daemon-driver-xen < 4.3.0
 Requires: xen-libs >= 2001:4.14.5-7
@@ -860,15 +963,22 @@ Conflicts: qubes-core-dom0 < 4.0.20-1
 The Libxl driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 Libxl
-%endif
-
-
+    %endif
 
-%if %{with_qemu_tcg}
+    %if %{with_qemu_tcg}
 %package daemon-qemu
 Summary: Server side daemon & driver required to run QEMU guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-log = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-lock = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
+Recommends: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-qemu = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{epoch}:%{version}-%{release}
 %if %{with_network}
@@ -883,19 +993,27 @@ Requires: qemu
 %description daemon-qemu
 Server side daemon and driver required to manage the virtualization
 capabilities of the QEMU TCG emulators
-%endif
-
+    %endif
 
-%if %{with_qemu_kvm}
+    %if %{with_qemu_kvm}
 %package daemon-kvm
 Summary: Server side daemon & driver required to run KVM guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-log = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-lock = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
+Recommends: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-qemu = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{epoch}:%{version}-%{release}
-%if %{with_network}
+        %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+        %endif
 Requires: libvirt-daemon-driver-nodedev = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{epoch}:%{version}-%{release}
@@ -905,19 +1023,24 @@ Requires: qemu-kvm
 %description daemon-kvm
 Server side daemon and driver required to manage the virtualization
 capabilities of the KVM hypervisor
-%endif
-
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package daemon-lxc
 Summary: Server side daemon & driver required to run LXC guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
+Recommends: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-lxc = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{epoch}:%{version}-%{release}
-%if %{with_network}
+        %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+        %endif
 Requires: libvirt-daemon-driver-nodedev = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{epoch}:%{version}-%{release}
@@ -926,40 +1049,56 @@ Requires: libvirt-daemon-driver-storage = %{epoch}:%{version}-%{release}
 %description daemon-lxc
 Server side daemon and driver required to manage the virtualization
 capabilities of LXC
-%endif
-
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %package daemon-xen
 Summary: Server side daemon & driver required to run XEN guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-lock = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
+Recommends: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
-    %if %{with_libxl}
+        %endif
 Requires: libvirt-daemon-driver-libxl = %{epoch}:%{version}-%{release}
-    %endif
 Requires: libvirt-daemon-driver-interface = %{epoch}:%{version}-%{release}
-%if %{with_network}
+        %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+        %endif
 Requires: libvirt-daemon-driver-nodedev = %{epoch}:%{version}-%{release}
+%if 0
+Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
+Requires: libvirt-daemon-driver-secret = %{version}-%{release}
+Requires: libvirt-daemon-driver-storage = %{version}-%{release}
+%endif
 Requires: xen
 Provides: libvirt-gvt
 
 %description daemon-xen
 Server side daemon and driver required to manage the virtualization
 capabilities of XEN
-%endif
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %package daemon-vbox
 Summary: Server side daemon & driver required to run VirtualBox guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{epoch}:%{version}-%{release}
+Requires: libvirt-daemon-proxy = %{epoch}:%{version}-%{release}
+Recommends: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{epoch}:%{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-vbox = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{epoch}:%{version}-%{release}
-%if %{with_network}
+        %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+        %endif
 Requires: libvirt-daemon-driver-nodedev = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{epoch}:%{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{epoch}:%{version}-%{release}
@@ -968,11 +1107,11 @@ Requires: libvirt-daemon-driver-storage = %{epoch}:%{version}-%{release}
 %description daemon-vbox
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
-%endif
+    %endif
 
 %package client
 Summary: Client side utilities of the libvirt library
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 # Needed by virt-pki-validate script.
 Requires: gnutls-utils
 
@@ -985,8 +1124,10 @@ capabilities of recent versions of Linux (and other OSes).
 
 %package client-qemu
 Summary: Additional client side utilities for QEMU
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: python3-libvirt >= %{epoch}:%{version}-%{release}
+Requires: python3-cryptography
+Requires: python3-lxml
 
 %description client-qemu
 The additional client binaries are used to interact
@@ -1003,61 +1144,63 @@ Requires: cyrus-sasl-gssapi
 %description libs
 Shared libraries for accessing the libvirt daemon.
 
-%if %{with_wireshark}
+    %if %{with_wireshark}
 %package wireshark
 Summary: Wireshark dissector plugin for libvirt RPC transactions
 Requires: wireshark
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 
 %description wireshark
 Wireshark dissector plugin for better analysis of libvirt RPC traffic.
-%endif
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package login-shell
 Summary: Login shell for connecting users to an LXC container
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 
 %description login-shell
 Provides the set-uid virt-login-shell binary that is used to
 connect a user to an LXC container when they login, by switching
 namespaces.
-%endif
+    %endif
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
 
 %description devel
 Include header files & development libraries for the libvirt C library.
 
-%if %{with_sanlock}
-%package lock-sanlock
+    %if %{with_sanlock}
+%package daemon-plugin-sanlock
 Summary: Sanlock lock manager plugin for QEMU driver
 Requires: sanlock >= 2.4
 #for virt-sanlock-cleanup require augeas
 Requires: augeas
-Requires: %{name}-daemon = %{epoch}:%{version}-%{release}
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: libvirt-libs = %{epoch}:%{version}-%{release}
+Obsoletes: libvirt-lock-sanlock < %{epoch}:9.1.0
+Provides: libvirt-lock-sanlock = %{epoch}:%{version}-%{release}
 
-%description lock-sanlock
+%description daemon-plugin-sanlock
 Includes the Sanlock lock manager plugin for the QEMU
 driver
-%endif
+    %endif
 
-%if %{with_nss}
+    %if %{with_nss}
 %package nss
 Summary: Libvirt plugin for Name Service Switch
-%if %{with_network}
+        %if %{with_network}
 Requires: libvirt-daemon-driver-network = %{epoch}:%{version}-%{release}
-%endif
+        %endif
 
 %description nss
 Libvirt plugin for NSS for translating domain names into IP addresses.
+    %endif
 %endif
 
-%if %{with_mingw}
+%if %{with_mingw32}
 %package -n mingw32-libvirt
 Summary: %{summary}
 Obsoletes: mingw32-libvirt-static < 7.0.0
@@ -1066,6 +1209,10 @@ BuildArch: noarch
 %description -n mingw32-libvirt
 MinGW Windows libvirt virtualization library.
 
+%{?mingw32_debug_package}
+%endif
+
+%if %{with_mingw64}
 %package -n mingw64-libvirt
 Summary: %{summary}
 Obsoletes: mingw64-libvirt-static < 7.0.0
@@ -1074,11 +1221,10 @@ BuildArch: noarch
 %description -n mingw64-libvirt
 MinGW Windows libvirt virtualization library.
 
-%{?mingw_debug_package}
+%{?mingw64_debug_package}
 %endif
 
 %prep
-
 %autosetup -S git_am
 
 %build
@@ -1173,6 +1319,18 @@ exit 1
     %define arg_numad -Dnumad=disabled
 %endif
 
+%if %{with_nbdkit}
+    %define arg_nbdkit -Dnbdkit=enabled
+%else
+    %define arg_nbdkit -Dnbdkit=disabled
+%endif
+
+%if %{with_nbdkit_config_default}
+    %define arg_nbdkit_config_default -Dnbdkit_config_default=enabled
+%else
+    %define arg_nbdkit_config_default -Dnbdkit_config_default=disabled
+%endif
+
 %if %{with_fuse}
     %define arg_fuse -Dfuse=enabled
 %else
@@ -1245,12 +1403,17 @@ exit 1
     %define arg_remote_mode -Dremote_default_mode=legacy
 %endif
 
+%if %{with_userfaultfd_sysctl}
+    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=enabled
+%else
+    %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled
+%endif
+
 %define when  %(date +"%%F-%%T")
 %define where %(hostname)
 %define who   %{?packager}%{!?packager:Unknown}
 %define arg_packager -Dpackager="%{who}, %{when}, %{where}"
 %define arg_packager_version -Dpackager_version="%{release}"
-
 %define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux"
 
 # place macros above and build commands below this comment
@@ -1260,8 +1423,10 @@ exit 1
 #export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
 
 
+%if %{with_native}
 %meson \
            -Drunstatedir=%{_rundir} \
+           -Dinitconfdir=%{_sysconfdir}/sysconfig \
            %{?arg_qemu} \
            %{?arg_openvz} \
            %{?arg_lxc} \
@@ -1297,6 +1462,7 @@ exit 1
            -Dcapng=enabled \
            %{?arg_fuse} \
            %{?arg_netcf} \
+           -Dnls=enabled \
            -Dselinux=enabled \
            %{?arg_selinux_mount} \
            -Dapparmor=disabled \
@@ -1306,6 +1472,8 @@ exit 1
            -Dyajl=enabled \
            %{?arg_sanlock} \
            -Dlibpcap=enabled \
+           %{?arg_nbdkit} \
+           %{?arg_nbdkit_config_default} \
            -Dlibnl=enabled \
            -Daudit=enabled \
            -Ddtrace=enabled \
@@ -1314,6 +1482,7 @@ exit 1
            %{?arg_wireshark} \
            %{?arg_libssh} \
            %{?arg_libssh2} \
+           -Dssh_proxy=disabled \
            -Dpm_utils=disabled \
            %{?arg_nss} \
            %{arg_packager} \
@@ -1323,6 +1492,8 @@ exit 1
            -Dqemu_moddir=%{qemu_moddir} \
            -Dqemu_datadir=%{qemu_datadir} \
            -Dtls_priority=%{tls_priority} \
+           -Dsysctl_config=enabled \
+           %{?arg_userfaultfd_sysctl} \
            %{?enable_werror} \
            -Dexpensive_tests=enabled \
            -Dinit_script=systemd \
@@ -1332,8 +1503,9 @@ exit 1
            %{?arg_login_shell}
 
 %meson_build
+%endif
 
-%if %{with_mingw}
+%if %{with_mingw32} || %{with_mingw64}
 %mingw_meson \
   --auto-features=enabled \
   -Ddriver_remote=enabled \
@@ -1362,20 +1534,23 @@ exit 1
   -Ddriver_vmware=disabled \
   -Ddriver_vz=disabled \
   -Ddtrace=disabled \
-  -Dexpensive_tests=enabled \
+  -Dexpensive_tests=disabled \
   -Dfirewalld=disabled \
   -Dfirewalld_zone=disabled \
   -Dfuse=disabled \
   -Dglusterfs=disabled \
   -Dhost_validate=disabled \
   -Dlibiscsi=disabled \
+  -Dnbdkit=disabled \
+  -Dnbdkit_config_default=disabled \
   -Dlibnl=disabled \
   -Dlibpcap=disabled \
   -Dlibssh2=disabled \
   -Dlibssh=disabled \
+  -Dssh_proxy=disabled \
   -Dlogin_shell=disabled \
   -Dnetcf=disabled \
-  -Dnls=disabled \
+  -Dnls=enabled \
   -Dnss=disabled \
   -Dnumactl=disabled \
   -Dnumad=disabled \
@@ -1403,11 +1578,12 @@ exit 1
   -Dstorage_vstorage=disabled \
   -Dstorage_zfs=disabled \
   -Dsysctl_config=disabled \
+  -Duserfaultfd_sysctl=disabled \
   -Dtests=disabled \
   -Dudev=disabled \
   -Dwireshark_dissector=disabled \
   -Dyajl=disabled
-%mingw_ninja
+    %mingw_ninja
 %endif
 
 cat >> src/remote/libvirtd.conf <<__EOF__
@@ -1424,11 +1600,12 @@ rm -fr %{buildroot}
 
 # Disabled in Qubes because we generate spec; on the other hand, we get
 # SOURCE_DATE_EPOCH set by RPM based on changelog
-#export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
+#export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
 
+%if %{with_native}
 %meson_install
 
-%if %{with_network}
+    %if %{with_network}
 # We don't want to install /etc/libvirt/qemu/networks in the main %%files list
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
@@ -1437,7 +1614,7 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
    $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
 # libvirt saves this file with mode 0600
 chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
-%endif
+    %endif
 
 # nwfilter files are installed in /usr/share/libvirt and copied to /etc in %%post
 # to avoid verification errors on changed files in /etc
@@ -1447,67 +1624,77 @@ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \
 # libvirt saves these files with mode 600
 chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml
 
-%if ! %{with_qemu}
+    %if ! %{with_qemu}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%endif
+rm -f $RPM_BUILD_ROOT%{_sysusersdir}/libvirt-qemu.conf
+    %endif
 %find_lang %{name}
 
-%if ! %{with_sanlock}
+    %if ! %{with_sanlock}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
-%endif
+    %endif
 
-%if ! %{with_lxc}
+    %if ! %{with_lxc}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%endif
+    %endif
 
-%if ! %{with_qemu}
+    %if ! %{with_qemu}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
-%endif
-%if ! %{with_lxc}
+    %endif
+    %if ! %{with_lxc}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc
-%endif
-%if ! %{with_libxl}
+    %endif
+    %if ! %{with_libxl}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
-%endif
+    %endif
 
 # Copied into libvirt-docs subpackage eventually
 mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
 
-%ifarch %{arches_systemtap_64bit}
+    %ifarch %{arches_systemtap_64bit}
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
 
-    %if %{with_qemu}
+        %if %{with_qemu}
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
+        %endif
     %endif
 %endif
 
-%if %{with_mingw}
+%if %{with_mingw32} || %{with_mingw64}
 %mingw_ninja_install
+%endif
 
+%if %{with_mingw32}
 rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
-rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
-rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
 rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
-rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
-
 rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
-rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
 rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh
+%endif
+
+%if %{with_mingw64}
+rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
 rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
+%endif
 
+%if %{with_mingw32} || %{with_mingw64}
 %mingw_debug_install_post
 
+%mingw_find_lang %{name}
+
 %endif
 
 # BEGIN QUBES SPECIFIC PART
@@ -1515,334 +1702,380 @@ cd $RPM_BUILD_ROOT%{_unitdir}
 rm -f libvirtd-tcp.socket libvirtd-tls.socket virtproxyd-tcp.socket virtproxyd-tls.socket
 # END QUBES SPECIFIC PART
 
-
 %check
+
+%if %{with_native}
 # Building on slow archs, like emulated s390x in Fedora copr, requires
 # raising the test timeout
 VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10
+%endif
 
-%define libvirt_daemon_schedule_restart() mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || : \
-/bin/systemctl is-active %1.service 1>/dev/null 2>&1 && \
-  touch %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 || :
+%define libvirt_rpmstatedir %{_localstatedir}/lib/rpm-state/libvirt
 
-%define libvirt_daemon_finish_restart() rm -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1 \
-rmdir %{_localstatedir}/lib/rpm-state/libvirt 2>/dev/null || :
+# Mark units such that presets will later be applied to them. Meant
+# to be called during %pre. Units that already exist on the system
+# will not be marked, with the assumption that presets have already
+# been applied at some point in the past. This makes it safe to call
+# this macro for all units each time %pre runs.
+%define libvirt_systemd_schedule_preset() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    for unit in %{?*}; do \
+        if ! test -e %{_unitdir}/$unit; then \
+            touch %{libvirt_rpmstatedir}/preset-$unit || : \
+        fi \
+    done \
+    %{nil}
+
+# Apply presets for units that have previously been marked. Meant to
+# be called during %posttrans. Note that foo.service must be passed
+# as the first argument, before all the various foo*.socket
+# associated with it, for things to work correctly. This is necessary
+# because Also=foo.socket is usually present in foo.service's
+# [Install] section, and we want that configuration to take
+# precedence over foo.socket's own presets.
+%define libvirt_systemd_perform_preset() \
+    %{?7:%{error:Too many arguments}} \
+    for unit in %{?2} %{?3} %{?4} %{?5} %{?6} %1; do \
+        if test -e %{libvirt_rpmstatedir}/preset-$unit; then \
+            /usr/bin/systemctl --no-reload preset $unit || : \
+        fi \
+        rm -f %{libvirt_rpmstatedir}/preset-$unit \
+    done \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Mark a single unit for restart. Meant to be called during %pre.
+%define libvirt_systemd_schedule_restart() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    touch %{libvirt_rpmstatedir}/restart-%1 || : \
+    %{nil}
+
+# Restart a unit that was previously marked. Meant to be called
+# during %posttrans. If systemd is not running, no action will be
+# performed.
+%define libvirt_systemd_perform_restart() \
+    if test -d /run/systemd/system && \
+       test -e %{libvirt_rpmstatedir}/restart-%1; then \
+        /usr/bin/systemctl try-restart %1 >/dev/null 2>&1 || : \
+    fi \
+    rm -f %{libvirt_rpmstatedir}/restart-%1 \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Mark a single unit for reload. Meant to be called during %pre.
+%define libvirt_systemd_schedule_reload() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    touch %{libvirt_rpmstatedir}/reload-%1 || : \
+    %{nil}
+
+# Reload a unit that was previously marked. Meant to be called during
+# %posttrans. If systemd is not running, no action will be performed.
+%define libvirt_systemd_perform_reload() \
+    if test -d /run/systemd/system && \
+       test -e %{libvirt_rpmstatedir}/reload-%1; then \
+        /usr/bin/systemctl try-reload-or-restart %1 >/dev/null 2>&1 || : \
+    fi \
+    rm -f %{libvirt_rpmstatedir}/reload-%1 \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Disable a single unit, optionally stopping it if systemd is
+# running. Meant to be called during %preun.
+%define libvirt_systemd_disable() \
+    if test -d /run/systemd/system; then \
+        /usr/bin/systemctl --no-reload disable --now %{?*} || : \
+    else \
+        /usr/bin/systemctl --no-reload disable %{?*} || : \
+    fi \
+    %{nil}
 
-%define libvirt_daemon_needs_restart() -f %{_localstatedir}/lib/rpm-state/libvirt/restart-%1
+# %pre implementation for services that should be restarted on
+# upgrade. Note that foo.service must be passed as the first
+# argument, before all the various foo*.socket associated with it.
+%define libvirt_systemd_restart_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %libvirt_systemd_schedule_restart %1 \
+    %{nil}
+
+# %pre implementation for services that should be reloaded on
+# upgrade. Note that foo.service must be passed as the first
+# argument, before all the various foo*.socket associated with it.
+%define libvirt_systemd_reload_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %libvirt_systemd_schedule_reload %1 \
+    %{nil}
+
+# %pre implementation for services that should be neither restarted
+# nor reloaded on upgrade.
+%define libvirt_systemd_noaction_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %{nil}
+
+# %posttrans implementation for all services. We can use a single
+# macro to cover all scenarios, because each operation will only be
+# performed if it had previously been scheduled. Note that
+# foo.service must be passed as the first argument, before all the
+# various foo*.socket associated with it.
+%define libvirt_systemd_posttrans() \
+    %libvirt_systemd_perform_preset %{?*} \
+    %libvirt_systemd_perform_reload %1 \
+    %libvirt_systemd_perform_restart %1 \
+    %{nil}
 
-%define libvirt_daemon_perform_restart() if test %libvirt_daemon_needs_restart %1 \
-then \
-  /bin/systemctl try-restart %1.service >/dev/null 2>&1 || : \
-fi \
-%libvirt_daemon_finish_restart %1
+# %preun implementation for all services.
+%define libvirt_systemd_preun() \
+    if [ $1 -lt 1 ]; then \
+        %libvirt_systemd_disable %{?*} \
+    fi \
+    %{nil}
 
 # For daemons with only UNIX sockets
-%define libvirt_daemon_systemd_post() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1.service
-%define libvirt_daemon_systemd_preun() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1.socket
+
+%define libvirt_systemd_unix_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_unix_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_unix_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket
 
 # For daemons with UNIX and INET sockets
 # BEGIN QUBES SPECIFIC PART (remove -tcp and -tls)
-%define libvirt_daemon_systemd_post_inet() %systemd_post %1.socket %1-ro.socket %1-admin.socket %1.service
-%define libvirt_daemon_systemd_preun_inet() %systemd_preun %1.service %1-ro.socket %1-admin.socket %1.socket
+%define libvirt_systemd_inet_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_inet_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_inet_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket
 # END QUBES SPECIFIC PART
 
 # For daemons with only UNIX sockets and no unprivileged read-only access
-%define libvirt_daemon_systemd_post_priv() %systemd_post %1.socket %1-admin.socket %1.service
-%define libvirt_daemon_systemd_preun_priv() %systemd_preun %1.service %1-admin.socket %1.socket
+%define libvirt_systemd_privileged_pre() %libvirt_systemd_reload_pre %1.service %1.socket %1-admin.socket
+%define libvirt_systemd_privileged_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-admin.socket
+%define libvirt_systemd_privileged_preun() %libvirt_systemd_preun %1.service %1.socket %1-admin.socket
+
+# For one-shot daemons that have no associated sockets and should never be restarted
+%define libvirt_systemd_oneshot_pre() %libvirt_systemd_noaction_pre %1.service
+%define libvirt_systemd_oneshot_posttrans() %libvirt_systemd_posttrans %1.service
+%define libvirt_systemd_oneshot_preun() %libvirt_systemd_preun %1.service
+
+# For packages that install configuration for other daemons
+%define libvirt_systemd_config_pre() %libvirt_systemd_schedule_restart %1.service
+%define libvirt_systemd_config_posttrans() %libvirt_systemd_perform_restart %1.service
 
+%if %{with_native}
 %pre daemon
-%libvirt_sysconfig_pre libvirtd virtproxyd virtlogd virtlockd libvirt-guests
-# 'libvirt' group is just to allow password-less polkit access to
-# libvirtd. The uid number is irrelevant, so we use dynamic allocation
-# described at the above link.
-getent group libvirt >/dev/null || groupadd -r libvirt
+%libvirt_sysconfig_pre libvirtd
+%libvirt_systemd_inet_pre libvirtd
+
+%posttrans daemon
+%libvirt_sysconfig_posttrans libvirtd
+%libvirt_systemd_inet_posttrans libvirtd
 
+%preun daemon
+%libvirt_systemd_inet_preun libvirtd
+
+%pre daemon-common
+%libvirt_sysconfig_pre libvirt-guests
+%libvirt_systemd_oneshot_pre libvirt-guests
+# 'libvirt' group is just to allow password-less polkit access to libvirt
+# daemons. The uid number is irrelevant, so we use dynamic allocation.
+getent group libvirt >/dev/null || groupadd -r libvirt
 exit 0
 
-%post daemon
-%libvirt_daemon_systemd_post_priv virtlogd
-%libvirt_daemon_systemd_post_priv virtlockd
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post_inet virtproxyd
-%else
-%libvirt_daemon_systemd_post_inet libvirtd
-%endif
+%posttrans daemon-common
+%libvirt_sysconfig_posttrans libvirt-guests
+%libvirt_systemd_oneshot_posttrans libvirt-guests
 
-%systemd_post libvirt-guests.service
+%preun daemon-common
+%libvirt_systemd_oneshot_preun libvirt-guests
 
-%libvirt_daemon_schedule_restart libvirtd
+%pre daemon-lock
+%libvirt_sysconfig_pre virtlockd
+%libvirt_systemd_privileged_pre virtlockd
 
-%preun daemon
-%systemd_preun libvirt-guests.service
+%posttrans daemon-lock
+%libvirt_sysconfig_posttrans virtlockd
+%libvirt_systemd_privileged_posttrans virtlockd
 
-%libvirt_daemon_systemd_preun_inet libvirtd
-%libvirt_daemon_systemd_preun_inet virtproxyd
-%libvirt_daemon_systemd_preun_priv virtlogd
-%libvirt_daemon_systemd_preun_priv virtlockd
+%preun daemon-lock
+%libvirt_systemd_privileged_preun virtlockd
 
-%postun daemon
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    /bin/systemctl reload-or-try-restart virtlockd.service virtlogd.service >/dev/null 2>&1 || :
-fi
-%systemd_postun libvirt-guests.service
-
-# In upgrade scenario we must explicitly enable virtlockd/virtlogd
-# sockets, if libvirtd is already enabled and start them if
-# libvirtd is running, otherwise you'll get failures to start
-# guests
-%triggerpostun daemon -- libvirt-daemon < 1.3.0
-if [ $1 -ge 1 ] ; then
-    /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
-        /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
-    /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
-        /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
-fi
+%pre daemon-log
+%libvirt_sysconfig_pre virtlogd
+%libvirt_systemd_privileged_pre virtlogd
+
+%posttrans daemon-log
+%libvirt_sysconfig_posttrans virtlogd
+%libvirt_systemd_privileged_posttrans virtlogd
+
+%preun daemon-log
+%libvirt_systemd_privileged_preun virtlogd
+
+%pre daemon-proxy
+%libvirt_sysconfig_pre virtproxyd
+%libvirt_systemd_inet_pre virtproxyd
+
+%posttrans daemon-proxy
+%libvirt_sysconfig_posttrans virtproxyd
+%libvirt_systemd_inet_posttrans virtproxyd
+
+%preun daemon-proxy
+%libvirt_systemd_inet_preun virtproxyd
 
 %triggerin -- xen-libs
 # BEGIN QUBES SPECIFIC PART
 # reload libxl library otherwise libvirt will use old libraries after update
-systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
+systemctl try-restart libvirtd.service virtxend.service >/dev/null 2>&1 || :
 # END QUBES SPECIFIC PART
 
-%posttrans daemon
-%libvirt_sysconfig_posttrans libvirtd virtproxyd virtlogd virtlockd libvirt-guests
-if test %libvirt_daemon_needs_restart libvirtd
-then
-    # See if user has previously modified their install to
-    # tell libvirtd to use --listen
-    grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1
-    if test $? = 0
-    then
-        # Then lets keep honouring --listen and *not* use
-        # systemd socket activation, because switching things
-        # might confuse mgmt tool like puppet/ansible that
-        # expect the old style libvirtd
-        /bin/systemctl mask >/dev/null \
-                libvirtd.socket \
-                libvirtd-ro.socket \
-                libvirtd-admin.socket
-# BEGIN QUBES SPECIFIC PART
-#                libvirtd-tls.socket \
-#                libvirtd-tcp.socket >/dev/null 2>&1 || :
-# END QUBES SPECIFIC PART
-    else
-        # Old libvirtd owns the sockets and will delete them on
-        # shutdown. Can't use a try-restart as libvirtd will simply
-        # own the sockets again when it comes back up. Thus we must
-        # do this particular ordering, so that we get libvirtd
-        # running with socket activation in use
-        /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
-        /bin/systemctl try-restart \
-                libvirtd.socket \
-                libvirtd-ro.socket \
-                libvirtd-admin.socket >/dev/null 2>&1 || :
-        /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
-    fi
-fi
-
-%libvirt_daemon_finish_restart libvirtd
-
 %if %{with_network}
 %pre daemon-driver-network
 %libvirt_sysconfig_pre virtnetworkd
+%libvirt_systemd_unix_pre virtnetworkd
 
 %post daemon-driver-network
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
     %firewalld_reload
-%endif
+    %endif
 
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtnetworkd
-%endif
-%libvirt_daemon_schedule_restart virtnetworkd
+%posttrans daemon-driver-network
+%libvirt_sysconfig_posttrans virtnetworkd
+%libvirt_systemd_unix_posttrans virtnetworkd
 
 %preun daemon-driver-network
-%libvirt_daemon_systemd_preun virtnetworkd
+%libvirt_systemd_unix_preun virtnetworkd
 
 %postun daemon-driver-network
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
     %firewalld_reload
-%endif
-
-%posttrans daemon-driver-network
-%libvirt_sysconfig_posttrans virtnetworkd
-%libvirt_daemon_perform_restart virtnetworkd
+    %endif
 
 %endif
 
 %pre daemon-driver-nwfilter
 %libvirt_sysconfig_pre virtnwfilterd
-
-%post daemon-driver-nwfilter
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtnwfilterd
-%endif
-%libvirt_daemon_schedule_restart virtnwfilterd
-
-%preun daemon-driver-nwfilter
-%libvirt_daemon_systemd_preun virtnwfilterd
+%libvirt_systemd_unix_pre virtnwfilterd
 
 %posttrans daemon-driver-nwfilter
 %libvirt_sysconfig_posttrans virtnwfilterd
-%libvirt_daemon_perform_restart virtnwfilterd
+%libvirt_systemd_unix_posttrans virtnwfilterd
+
+%preun daemon-driver-nwfilter
+%libvirt_systemd_unix_preun virtnwfilterd
 
 %pre daemon-driver-nodedev
 %libvirt_sysconfig_pre virtnodedevd
-
-%post daemon-driver-nodedev
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtnodedevd
-%endif
-%libvirt_daemon_schedule_restart virtnodedevd
-
-%preun daemon-driver-nodedev
-%libvirt_daemon_systemd_preun virtnodedevd
+%libvirt_systemd_unix_pre virtnodedevd
 
 %posttrans daemon-driver-nodedev
 %libvirt_sysconfig_posttrans virtnodedevd
-%libvirt_daemon_perform_restart virtnodedevd
+%libvirt_systemd_unix_posttrans virtnodedevd
+
+%preun daemon-driver-nodedev
+%libvirt_systemd_unix_preun virtnodedevd
 
 %pre daemon-driver-interface
 %libvirt_sysconfig_pre virtinterfaced
-
-%post daemon-driver-interface
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtinterfaced
-%endif
-%libvirt_daemon_schedule_restart virtinterfaced
-
-%preun daemon-driver-interface
-%libvirt_daemon_systemd_preun virtinterfaced
+%libvirt_systemd_unix_pre virtinterfaced
 
 %posttrans daemon-driver-interface
 %libvirt_sysconfig_posttrans virtinterfaced
-%libvirt_daemon_perform_restart virtinterfaced
+%libvirt_systemd_unix_posttrans virtinterfaced
+
+%preun daemon-driver-interface
+%libvirt_systemd_unix_preun virtinterfaced
 
 %pre daemon-driver-secret
 %libvirt_sysconfig_pre virtsecretd
-
-%post daemon-driver-secret
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtsecretd
-%endif
-%libvirt_daemon_schedule_restart virtsecretd
-
-%preun daemon-driver-secret
-%libvirt_daemon_systemd_preun virtsecretd
+%libvirt_systemd_unix_pre virtsecretd
 
 %posttrans daemon-driver-secret
 %libvirt_sysconfig_posttrans virtsecretd
-%libvirt_daemon_perform_restart virtsecretd
+%libvirt_systemd_unix_posttrans virtsecretd
 
+%preun daemon-driver-secret
+%libvirt_systemd_unix_preun virtsecretd
 
 %pre daemon-driver-storage-core
 %libvirt_sysconfig_pre virtstoraged
-
-%post daemon-driver-storage-core
-%if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtstoraged
-%endif
-%libvirt_daemon_schedule_restart virtstoraged
-
-%preun daemon-driver-storage-core
-%libvirt_daemon_systemd_preun virtstoraged
+%libvirt_systemd_unix_pre virtstoraged
 
 %posttrans daemon-driver-storage-core
 %libvirt_sysconfig_posttrans virtstoraged
-%libvirt_daemon_perform_restart virtstoraged
+%libvirt_systemd_unix_posttrans virtstoraged
 
+%preun daemon-driver-storage-core
+%libvirt_systemd_unix_preun virtstoraged
 
-%if %{with_qemu}
+    %if %{with_qemu}
 %pre daemon-driver-qemu
 %libvirt_sysconfig_pre virtqemud
+%libvirt_systemd_unix_pre virtqemud
+
 # We want soft static allocation of well-known ids, as disk images
-# are commonly shared across NFS mounts by id rather than name; see
-# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
-getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
-getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
-if ! getent passwd qemu >/dev/null; then
-  if ! getent passwd 107 >/dev/null; then
-    useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+# are commonly shared across NFS mounts by id rather than name.
+# See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/
+# We can not use the sysusers_create_compat macro here as we want to keep the
+# specfile standalone and not relying on additionnal files.
+getent group 'kvm' >/dev/null || groupadd -f -g '36' -r 'kvm' || :
+getent group 'qemu' >/dev/null || groupadd -f -g '107' -r 'qemu' || :
+if ! getent passwd 'qemu' >/dev/null; then
+  if ! getent passwd '107' >/dev/null; then
+    useradd -r -u '107' -g 'qemu' -G 'kvm' -d '/' -s '/sbin/nologin' -c 'qemu user' 'qemu' || :
   else
-    useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+    useradd -r -g 'qemu' -G 'kvm' -d '/' -s '/sbin/nologin' -c 'qemu user' 'qemu' || :
   fi
 fi
 exit 0
 
-%post daemon-driver-qemu
-    %if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtqemud
-    %endif
-%libvirt_daemon_schedule_restart virtqemud
-
-%preun daemon-driver-qemu
-%libvirt_daemon_systemd_preun virtqemud
-
 %posttrans daemon-driver-qemu
 %libvirt_sysconfig_posttrans virtqemud
-%libvirt_daemon_perform_restart virtqemud
-%endif
+%libvirt_systemd_unix_posttrans virtqemud
 
+%preun daemon-driver-qemu
+%libvirt_systemd_unix_preun virtqemud
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %pre daemon-driver-lxc
 %libvirt_sysconfig_pre virtlxcd
-
-%post daemon-driver-lxc
-    %if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtlxcd
-    %endif
-%libvirt_daemon_schedule_restart virtlxcd
-
-%preun daemon-driver-lxc
-%libvirt_daemon_systemd_preun virtlxcd
+%libvirt_systemd_unix_pre virtlxcd
 
 %posttrans daemon-driver-lxc
 %libvirt_sysconfig_posttrans virtlxcd
-%libvirt_daemon_perform_restart virtlxcd
-%endif
-
+%libvirt_systemd_unix_posttrans virtlxcd
 
-%if %{with_vbox}
-%post daemon-driver-vbox
-    %if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtvboxd
+%preun daemon-driver-lxc
+%libvirt_systemd_unix_preun virtlxcd
     %endif
-%libvirt_daemon_schedule_restart virtvboxd
 
+    %if %{with_vbox}
 %pre daemon-driver-vbox
 %libvirt_sysconfig_pre virtvboxd
-
-%preun daemon-driver-vbox
-%libvirt_daemon_systemd_preun virtvboxd
+%libvirt_systemd_unix_pre virtvboxd
 
 %posttrans daemon-driver-vbox
 %libvirt_sysconfig_posttrans virtvboxd
-%libvirt_daemon_perform_restart virtvboxd
-%endif
-
+%libvirt_systemd_unix_posttrans virtvboxd
 
-%if %{with_libxl}
-%post daemon-driver-libxl
-    %if %{with_modular_daemons}
-%libvirt_daemon_systemd_post virtxend
+%preun daemon-driver-vbox
+%libvirt_systemd_unix_preun virtvboxd
     %endif
-%libvirt_daemon_schedule_restart virtxend
 
+    %if %{with_libxl}
 %pre daemon-driver-libxl
 %libvirt_sysconfig_pre virtxend
-
-%preun daemon-driver-libxl
-%libvirt_daemon_systemd_preun virtxend
+%libvirt_systemd_unix_pre virtxend
 
 %posttrans daemon-driver-libxl
 %libvirt_sysconfig_posttrans virtxend
-%libvirt_daemon_perform_restart virtxend
-%endif
+%libvirt_systemd_unix_posttrans virtxend
+
+%preun daemon-driver-libxl
+%libvirt_systemd_unix_preun virtxend
+    %endif
 
 
 %if %{with_network}
+
+%pre daemon-config-network
+%libvirt_systemd_config_pre libvirtd
+%libvirt_systemd_config_pre virtnetworkd
+
 %post daemon-config-network
 if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then
     # see if the network used by default network creates a conflict,
@@ -1879,17 +2112,18 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
     # libvirt saves this file with mode 0600
     chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
-
-    # Make sure libvirt picks up the new network defininiton
-    %libvirt_daemon_schedule_restart libvirtd
-    %libvirt_daemon_schedule_restart virtnetworkd
 fi
 
 %posttrans daemon-config-network
-%libvirt_daemon_perform_restart libvirtd
-%libvirt_daemon_perform_restart virtnetworkd
+%libvirt_systemd_config_posttrans libvirtd
+%libvirt_systemd_config_posttrans virtnetworkd
+
 %endif
 
+%pre daemon-config-nwfilter
+%libvirt_systemd_config_pre libvirtd
+%libvirt_systemd_config_pre virtnwfilterd
+
 %post daemon-config-nwfilter
 for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
   sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file")
@@ -1898,20 +2132,19 @@ for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
     install -m 0600 "$datadir_file" "$sysconfdir_file"
   fi
 done
-# Make sure libvirt picks up the new nwfilter defininitons
-%libvirt_daemon_schedule_restart libvirtd
-%libvirt_daemon_schedule_restart virtnwfilterd
 
 %posttrans daemon-config-nwfilter
-%libvirt_daemon_perform_restart libvirtd
-%libvirt_daemon_perform_restart virtnwfilterd
+%libvirt_systemd_config_posttrans libvirtd
+%libvirt_systemd_config_posttrans virtnwfilterd
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %pre login-shell
 getent group virtlogin >/dev/null || groupadd -r virtlogin
 exit 0
+    %endif
 %endif
 
+%if %{with_native}
 %files
 
 %files docs
@@ -1919,7 +2152,6 @@ exit 0
 %doc libvirt-docs/*
 
 %files daemon
-
 %{_unitdir}/libvirtd.service
 %{_unitdir}/libvirtd.socket
 %{_unitdir}/libvirtd-ro.socket
@@ -1928,89 +2160,88 @@ exit 0
 # %%{_unitdir}/libvirtd-tcp.socket
 # %%{_unitdir}/libvirtd-tls.socket
 # END QUBES SPECIFIC PART
-%{_unitdir}/virtproxyd.service
-%{_unitdir}/virtproxyd.socket
-%{_unitdir}/virtproxyd-ro.socket
-%{_unitdir}/virtproxyd-admin.socket
-# BEGIN QUBES SPECIFIC PART
-# %%{_unitdir}/virtproxyd-tcp.socket
-# %%{_unitdir}/virtproxyd-tls.socket
-# END QUBES SPECIFIC PART
-%{_unitdir}/virt-guest-shutdown.target
-%{_unitdir}/virtlogd.service
-%{_unitdir}/virtlogd.socket
-%{_unitdir}/virtlogd-admin.socket
-%{_unitdir}/virtlockd.service
-%{_unitdir}/virtlockd.socket
-%{_unitdir}/virtlockd-admin.socket
-%{_unitdir}/libvirt-guests.service
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
-
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
-%dir %{_datadir}/libvirt/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%attr(0755, root, root) %{_sbindir}/libvirtd
+%{_mandir}/man8/libvirtd.8*
 
+%files daemon-common
+%{_unitdir}/virt-guest-shutdown.target
+%{_unitdir}/libvirt-guests.service
+%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%dir %{_datadir}/libvirt/
 %ghost %dir %{_rundir}/libvirt/
 %ghost %dir %{_rundir}/libvirt/common/
-
 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
-
-
 %dir %attr(0755, root, root) %{_libdir}/libvirt/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
-%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
-%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
-
-%{_datadir}/augeas/lenses/libvirtd.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{_datadir}/augeas/lenses/virtlogd.aug
-%{_datadir}/augeas/lenses/tests/test_virtlogd.aug
-%{_datadir}/augeas/lenses/virtlockd.aug
-%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
-%{_datadir}/augeas/lenses/virtproxyd.aug
-%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
-%{_datadir}/augeas/lenses/libvirt_lockd.aug
-%if %{with_qemu}
-%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
-%endif
-
+%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
-
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-
 %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
-
 %attr(0755, root, root) %{_bindir}/virt-ssh-helper
-
-%attr(0755, root, root) %{_sbindir}/libvirtd
-%attr(0755, root, root) %{_sbindir}/virtproxyd
-%attr(0755, root, root) %{_sbindir}/virtlogd
-%attr(0755, root, root) %{_sbindir}/virtlockd
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
-
 %{_mandir}/man1/virt-admin.1*
 %{_mandir}/man1/virt-host-validate.1*
 %{_mandir}/man8/virt-ssh-helper.8*
 %{_mandir}/man8/libvirt-guests.8*
-%{_mandir}/man8/libvirtd.8*
-%{_mandir}/man8/virtlogd.8*
-%{_mandir}/man8/virtlockd.8*
-%{_mandir}/man8/virtproxyd.8*
-
 %{_bindir}/virt-host-validate
 %{_bindir}/virt-admin
 %{_datadir}/bash-completion/completions/virt-admin
 
+%files daemon-lock
+%{_unitdir}/virtlockd.service
+%{_unitdir}/virtlockd.socket
+%{_unitdir}/virtlockd-admin.socket
+%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
+%{_datadir}/augeas/lenses/virtlockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%{_datadir}/augeas/lenses/libvirt_lockd.aug
+    %if %{with_qemu}
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+    %endif
+%attr(0755, root, root) %{_sbindir}/virtlockd
+%{_mandir}/man8/virtlockd.8*
+
+%files daemon-plugin-lockd
+%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
+%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
+
+%files daemon-log
+%{_unitdir}/virtlogd.service
+%{_unitdir}/virtlogd.socket
+%{_unitdir}/virtlogd-admin.socket
+%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
+%{_datadir}/augeas/lenses/virtlogd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlogd.aug
+%attr(0755, root, root) %{_sbindir}/virtlogd
+%{_mandir}/man8/virtlogd.8*
+
+%files daemon-proxy
+%{_unitdir}/virtproxyd.service
+%{_unitdir}/virtproxyd.socket
+%{_unitdir}/virtproxyd-ro.socket
+%{_unitdir}/virtproxyd-admin.socket
+# BEGIN QUBES SPECIFIC PART
+# %%{_unitdir}/virtproxyd-tcp.socket
+# %%{_unitdir}/virtproxyd-tls.socket
+# END QUBES SPECIFIC PART
+%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%attr(0755, root, root) %{_sbindir}/virtproxyd
+%{_mandir}/man8/virtproxyd.8*
+
 %if %{with_network}
 %files daemon-config-network
 %dir %{_datadir}/libvirt/networks/
@@ -2034,7 +2265,7 @@ exit 0
 %{_unitdir}/virtinterfaced-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtinterfaced
 %ghost %dir %{_rundir}/libvirt/interface/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so
 %{_mandir}/man8/virtinterfaced.8*
 
 %if %{with_network}
@@ -2054,12 +2285,16 @@ exit 0
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
-%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
 %{_mandir}/man8/virtnetworkd.8*
 
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
 %{_prefix}/lib/firewalld/zones/libvirt.xml
-%endif
+%{_prefix}/lib/firewalld/zones/libvirt-routed.xml
+%{_prefix}/lib/firewalld/policies/libvirt-routed-in.xml
+%{_prefix}/lib/firewalld/policies/libvirt-routed-out.xml
+%{_prefix}/lib/firewalld/policies/libvirt-to-host.xml
+    %endif
 %endif
 
 %files daemon-driver-nodedev
@@ -2072,7 +2307,7 @@ exit 0
 %{_unitdir}/virtnodedevd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtnodedevd
 %ghost %dir %{_rundir}/libvirt/nodedev/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
 %{_mandir}/man8/virtnodedevd.8*
 
 %files daemon-driver-nwfilter
@@ -2088,7 +2323,7 @@ exit 0
 %ghost %dir %{_rundir}/libvirt/network/
 %ghost %dir %{_rundir}/libvirt/nwfilter-binding/
 %ghost %dir %{_rundir}/libvirt/nwfilter/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
 %{_mandir}/man8/virtnwfilterd.8*
 
 %files daemon-driver-secret
@@ -2102,7 +2337,7 @@ exit 0
 %attr(0755, root, root) %{_sbindir}/virtsecretd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/
 %ghost %dir %{_rundir}/libvirt/secrets/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
 %{_mandir}/man8/virtsecretd.8*
 
 %files daemon-driver-storage
@@ -2120,51 +2355,53 @@ exit 0
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/
 %ghost %dir %{_rundir}/libvirt/storage/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
-%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
+%{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
 %{_mandir}/man8/virtstoraged.8*
 
 %files daemon-driver-storage-disk
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
 
 %files daemon-driver-storage-logical
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
 
 %files daemon-driver-storage-scsi
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
 
 %files daemon-driver-storage-iscsi
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
 
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 %files daemon-driver-storage-iscsi-direct
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
+    %endif
 
 %files daemon-driver-storage-mpath
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
 
-%if %{with_storage_gluster}
+    %if %{with_storage_gluster}
 %files daemon-driver-storage-gluster
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so
-%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
+%{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
+    %endif
 
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 %files daemon-driver-storage-rbd
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
+    %endif
 
-%if %{with_storage_zfs}
+    %if %{with_storage_zfs}
 %files daemon-driver-storage-zfs
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+    %endif
 
-%if %{with_qemu}
+    %if %{with_qemu}
 %files daemon-driver-qemu
 %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
+        %if %{with_userfaultfd_sysctl}
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
+        %endif
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %{_unitdir}/virtqemud.service
@@ -2180,11 +2417,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
 %ghost %dir %{_rundir}/libvirt/qemu/
 %ghost %dir %{_rundir}/libvirt/qemu/dbus/
+%ghost %dir %{_rundir}/libvirt/qemu/passt/
 %ghost %dir %{_rundir}/libvirt/qemu/slirp/
 %ghost %dir %{_rundir}/libvirt/qemu/swtpm/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
-%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
-%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/
@@ -2194,15 +2430,16 @@ exit 0
 %dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/
 %dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/
 %{_bindir}/virt-qemu-run
 %{_mandir}/man1/virt-qemu-run.1*
 %{_mandir}/man8/virtqemud.8*
-%endif
+%{_sysusersdir}/libvirt-qemu.conf
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files daemon-driver-lxc
 %config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
 %{_datadir}/augeas/lenses/virtlxcd.aug
@@ -2222,11 +2459,11 @@ exit 0
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
-%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
 %{_mandir}/man8/virtlxcd.8*
-%endif
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %files daemon-driver-libxl
 %config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
 %{_datadir}/augeas/lenses/virtxend.aug
@@ -2250,11 +2487,11 @@ exit 0
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
 %{_mandir}/man8/virtxend.8*
-%endif
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %files daemon-driver-vbox
 %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
 %{_datadir}/augeas/lenses/virtvboxd.aug
@@ -2264,38 +2501,39 @@ exit 0
 %{_unitdir}/virtvboxd-ro.socket
 %{_unitdir}/virtvboxd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtvboxd
-%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
 %{_mandir}/man8/virtvboxd.8*
-%endif
+    %endif
 
-%if %{with_qemu_tcg}
+    %if %{with_qemu_tcg}
 %files daemon-qemu
-%endif
+    %endif
 
-%if %{with_qemu_kvm}
+    %if %{with_qemu_kvm}
 %files daemon-kvm
-%endif
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files daemon-lxc
-%endif
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %files daemon-xen
-%endif
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %files daemon-vbox
-%endif
+    %endif
 
-%if %{with_sanlock}
-%files lock-sanlock
-    %if %{with_qemu}
+    %if %{with_sanlock}
+%files daemon-plugin-sanlock
+        %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
-    %endif
-    %if %{with_libxl}
+        %endif
+        %if %{with_libxl}
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
-    %endif
+        %endif
+%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
@@ -2303,7 +2541,7 @@ exit 0
 %{_sbindir}/virt-sanlock-cleanup
 %{_mandir}/man8/virt-sanlock-cleanup.8*
 %attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
-%endif
+    %endif
 
 %files client
 %{_mandir}/man1/virsh.1*
@@ -2315,14 +2553,15 @@ exit 0
 %{_bindir}/virt-xml-validate
 %{_bindir}/virt-pki-query-dn
 %{_bindir}/virt-pki-validate
-
 %{_datadir}/bash-completion/completions/virsh
 
-%if %{with_qemu}
+    %if %{with_qemu}
 %files client-qemu
 %{_mandir}/man1/virt-qemu-qmp-proxy.1*
+%{_mandir}/man1/virt-qemu-sev-validate.1*
 %{_bindir}/virt-qemu-qmp-proxy
-%endif
+%{_bindir}/virt-qemu-sev-validate
+    %endif
 
 %files libs -f %{name}.lang
 %license COPYING COPYING.LESSER
@@ -2335,37 +2574,33 @@ exit 0
 %{_libdir}/libvirt-admin.so.*
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/schemas/
-
 %{_datadir}/systemtap/tapset/libvirt_probes*.stp
 %{_datadir}/systemtap/tapset/libvirt_functions.stp
-%if %{with_qemu}
+    %if %{with_qemu}
 %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
-%endif
-
+    %endif
 %{_datadir}/libvirt/schemas/*.rng
-
 %{_datadir}/libvirt/cpu_map/*.xml
-
 %{_datadir}/libvirt/test-screenshot.png
 
-%if %{with_wireshark}
+    %if %{with_wireshark}
 %files wireshark
 %{wireshark_plugindir}/libvirt.so
-%endif
+    %endif
 
-%if %{with_nss}
+    %if %{with_nss}
 %files nss
 %{_libdir}/libnss_libvirt.so.2
 %{_libdir}/libnss_libvirt_guest.so.2
-%endif
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files login-shell
 %attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
 %{_libexecdir}/virt-login-shell-helper
 %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %{_mandir}/man1/virt-login-shell.1*
-%endif
+    %endif
 
 %files devel
 %{_libdir}/libvirt.so
@@ -2395,29 +2630,29 @@ exit 0
 %{_libdir}/pkgconfig/libvirt-admin.pc
 %{_libdir}/pkgconfig/libvirt-qemu.pc
 %{_libdir}/pkgconfig/libvirt-lxc.pc
-
 %dir %{_datadir}/libvirt/api/
 %{_datadir}/libvirt/api/libvirt-api.xml
 %{_datadir}/libvirt/api/libvirt-admin-api.xml
 %{_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{_datadir}/libvirt/api/libvirt-lxc-api.xml
+%endif
 
-%if %{with_mingw}
-%files -n mingw32-libvirt
+%if %{with_mingw32}
+%files -n mingw32-libvirt -f mingw32-libvirt.lang
 %dir %{mingw32_sysconfdir}/libvirt/
 %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf
-
 %{mingw32_bindir}/libvirt-0.dll
 %{mingw32_bindir}/virsh.exe
 %{mingw32_bindir}/virt-admin.exe
 %{mingw32_bindir}/virt-xml-validate
 %{mingw32_bindir}/virt-pki-query-dn.exe
+    %if %{with_nss}
 %{mingw32_bindir}/virt-pki-validate
+    %endif
 %{mingw32_bindir}/libvirt-lxc-0.dll
 %{mingw32_bindir}/libvirt-qemu-0.dll
 %{mingw32_bindir}/libvirt-admin-0.dll
-
 %{mingw32_libdir}/libvirt.dll.a
 %{mingw32_libdir}/pkgconfig/libvirt.pc
 %{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
@@ -2426,23 +2661,16 @@ exit 0
 %{mingw32_libdir}/libvirt-lxc.dll.a
 %{mingw32_libdir}/libvirt-qemu.dll.a
 %{mingw32_libdir}/libvirt-admin.dll.a
-
 %dir %{mingw32_datadir}/libvirt/
 %dir %{mingw32_datadir}/libvirt/schemas/
 %{mingw32_datadir}/libvirt/schemas/*.rng
-
 %dir %{mingw32_datadir}/libvirt/api/
 %{mingw32_datadir}/libvirt/api/libvirt-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
-
 %{mingw32_datadir}/libvirt/cpu_map/*.xml
-
 %{mingw32_datadir}/libvirt/test-screenshot.png
-
-%{mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo
-
 %dir %{mingw32_includedir}/libvirt
 %{mingw32_includedir}/libvirt/libvirt.h
 %{mingw32_includedir}/libvirt/libvirt-common.h
@@ -2462,30 +2690,30 @@ exit 0
 %{mingw32_includedir}/libvirt/libvirt-lxc.h
 %{mingw32_includedir}/libvirt/libvirt-qemu.h
 %{mingw32_includedir}/libvirt/libvirt-admin.h
-
 %{mingw32_mandir}/man1/virsh.1*
 %{mingw32_mandir}/man1/virt-admin.1*
 %{mingw32_mandir}/man1/virt-xml-validate.1*
 %{mingw32_mandir}/man1/virt-pki-query-dn.1*
 %{mingw32_mandir}/man1/virt-pki-validate.1*
 %{mingw32_mandir}/man7/virkey*.7*
+%endif
 
-
-%files -n mingw64-libvirt
+%if %{with_mingw64}
+%files -n mingw64-libvirt -f mingw64-libvirt.lang
 %dir %{mingw64_sysconfdir}/libvirt/
 %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf
-
 %{mingw64_bindir}/libvirt-0.dll
 %{mingw64_bindir}/virsh.exe
 %{mingw64_bindir}/virt-admin.exe
 %{mingw64_bindir}/virt-xml-validate
 %{mingw64_bindir}/virt-pki-query-dn.exe
+    %if %{with_nss}
 %{mingw64_bindir}/virt-pki-validate
+    %endif
 %{mingw64_bindir}/libvirt-lxc-0.dll
 %{mingw64_bindir}/libvirt-qemu-0.dll
 %{mingw64_bindir}/libvirt-admin-0.dll
-
 %{mingw64_libdir}/libvirt.dll.a
 %{mingw64_libdir}/pkgconfig/libvirt.pc
 %{mingw64_libdir}/pkgconfig/libvirt-qemu.pc
@@ -2494,23 +2722,16 @@ exit 0
 %{mingw64_libdir}/libvirt-lxc.dll.a
 %{mingw64_libdir}/libvirt-qemu.dll.a
 %{mingw64_libdir}/libvirt-admin.dll.a
-
 %dir %{mingw64_datadir}/libvirt/
 %dir %{mingw64_datadir}/libvirt/schemas/
 %{mingw64_datadir}/libvirt/schemas/*.rng
-
 %dir %{mingw64_datadir}/libvirt/api/
 %{mingw64_datadir}/libvirt/api/libvirt-api.xml
 %{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml
 %{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
-
 %{mingw64_datadir}/libvirt/cpu_map/*.xml
-
 %{mingw64_datadir}/libvirt/test-screenshot.png
-
-%{mingw64_datadir}/locale/*/LC_MESSAGES/libvirt.mo
-
 %dir %{mingw64_includedir}/libvirt
 %{mingw64_includedir}/libvirt/libvirt.h
 %{mingw64_includedir}/libvirt/libvirt-common.h
@@ -2530,7 +2751,6 @@ exit 0
 %{mingw64_includedir}/libvirt/libvirt-lxc.h
 %{mingw64_includedir}/libvirt/libvirt-qemu.h
 %{mingw64_includedir}/libvirt/libvirt-admin.h
-
 %{mingw64_mandir}/man1/virsh.1*
 %{mingw64_mandir}/man1/virt-admin.1*
 %{mingw64_mandir}/man1/virt-xml-validate.1*
diff --git a/version b/version
index e5c1510..2cf514e 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-8.9.0
+10.5.0