Update to 10.5.0 and adjust for Xen 4.19

.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

.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

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,26 +24,26 @@ 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);
 +    def->script = virXPathString("string(./script/@path)", ctxt);
      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
 

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
 

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,15 +61,15 @@ 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);
 +    g_free(def->emulator_cmdline);
      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,21 +79,21 @@ 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);
 +
      /* 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
 

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