Skip to content

Commit

Permalink
Update to 6.3.0
Browse files Browse the repository at this point in the history 
- remove patches applied upstream
- sync libvirt.spec with upstream
  • Loading branch information
@marmarek
marmarek committed May 7, 2020
1 parent b5371ea commit cfedef8
Show file tree
Hide file tree
Showing 18 changed files with 189 additions and 711 deletions.
24 changes: 12 additions & 12 deletions 0001-conf-add-script-attribute-to-disk-specification.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5aaef083c1677193ae1fe25f3de089a7ea1fce08 Mon Sep 17 00:00:00 2001
From 0c09d052d1b6a10afeefabec32c4d7d93dd9a585 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
Expand Down Expand Up @@ -26,10 +26,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
3 files changed, 16 insertions(+)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 76d94b156f..c167f56e27 100644
index 9d60b090f3..7d7d6b04c6 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1387,6 +1387,14 @@
@@ -1388,6 +1388,14 @@
<empty/>
</element>
</optional>
Expand All @@ -45,26 +45,26 @@ index 76d94b156f..c167f56e27 100644
<element name="readonly">
<empty/>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ee57152da7..48629c7fed 100644
index 8a87586936..16e42b1f51 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2108,6 +2108,7 @@ virDomainDiskDefFree(virDomainDiskDefPtr def)
@@ -2192,6 +2192,7 @@ virDomainDiskDefFree(virDomainDiskDefPtr def)
VIR_FREE(def->domain_name);
VIR_FREE(def->blkdeviotune.group_name);
VIR_FREE(def->virtio);
+ VIR_FREE(def->script);
virDomainDeviceInfoClear(&def->info);
virObjectUnref(def->privateData);

@@ -10068,6 +10069,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
@@ -10422,6 +10423,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
g_autofree char *vendor = NULL;
g_autofree char *product = NULL;
g_autofree char *domain_name = NULL;
+ g_autofree char *script = NULL;

if (!(def = virDomainDiskDefNew(xmlopt)))
return NULL;
@@ -10169,6 +10171,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
@@ -10523,6 +10525,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
} else if (virXMLNodeNameEqual(cur, "geometry")) {
if (virDomainDiskDefGeometryParse(def, cur) < 0)
goto error;
Expand All @@ -74,15 +74,15 @@ index ee57152da7..48629c7fed 100644
} else if (virXMLNodeNameEqual(cur, "blockio")) {
logical_block_size =
virXMLPropString(cur, "logical_block_size");
@@ -10434,6 +10439,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
@@ -10788,6 +10793,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
if (encryption)
def->src->encryption = g_steal_pointer(&encryption);
def->domain_name = g_steal_pointer(&domain_name);
+ def->script = g_steal_pointer(&script);
def->serial = g_steal_pointer(&serial);
def->wwn = g_steal_pointer(&wwn);
def->vendor = g_steal_pointer(&vendor);
@@ -24599,6 +24605,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
@@ -25454,6 +25460,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
return -1;

virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name);
Expand All @@ -91,10 +91,10 @@ index ee57152da7..48629c7fed 100644
virDomainDiskGeometryDefFormat(buf, def);
virDomainDiskBlockIoDefFormat(buf, def);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 6ae89fa498..87afd9bda4 100644
index 4afd8f04bc..9b92b86caa 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -575,6 +575,7 @@ struct _virDomainDiskDef {
@@ -579,6 +579,7 @@ struct _virDomainDiskDef {
unsigned int queues;
int model; /* enum virDomainDiskModel */
virDomainVirtioOptionsPtr virtio;
Expand All @@ -103,5 +103,5 @@ index 6ae89fa498..87afd9bda4 100644


--
2.21.0
2.21.1

8 changes: 4 additions & 4 deletions 0002-libxl-use-disk-script-attribute.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c8b87fd436fd663ff7454c78f89791aea3958b89 Mon Sep 17 00:00:00 2001
From dac27fbc26415add1619b8f65de3154bea90082a 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
Expand All @@ -20,10 +20,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 2488bb9d32..0db9518f6b 100644
index 458dfc2399..74f3bbcae6 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1003,6 +1003,8 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
@@ -1041,6 +1041,8 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)

x_disk->vdev = g_strdup(l_disk->dst);

Expand All @@ -33,5 +33,5 @@ index 2488bb9d32..0db9518f6b 100644
if (STREQ(driver, "tap") || STREQ(driver, "tap2")) {
switch (format) {
--
2.21.0
2.21.1

38 changes: 19 additions & 19 deletions 0003-libxl-Stubdom-emulator-type.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2e6f1a15d76fa48232e2848b509be40ad589c671 Mon Sep 17 00:00:00 2001
From d2026a17871ce5c27739fb3a85e5304a3dcb0f6f 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
Expand All @@ -23,10 +23,10 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
5 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 6e86d057a8..1e4813d44c 100644
index 91d6f6c0d3..72a4d99b7e 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2748,6 +2748,23 @@
@@ -2829,6 +2829,23 @@
The <a href="formatcaps.html">capabilities XML</a> specifies
the recommended default emulator to use for each particular
domain type / architecture combination.
Expand All @@ -51,10 +51,10 @@ index 6e86d057a8..1e4813d44c 100644
</dl>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index c167f56e27..0161adf675 100644
index 7d7d6b04c6..1f950d2dc9 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -3205,7 +3205,33 @@
@@ -3450,7 +3450,33 @@
-->
<define name="emulator">
<element name="emulator">
Expand Down Expand Up @@ -90,10 +90,10 @@ index c167f56e27..0161adf675 100644
</define>
<!--
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 48629c7fed..5151d8a05b 100644
index 16e42b1f51..ab1bec4ee9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1101,6 +1101,11 @@ VIR_ENUM_IMPL(virDomainDiskTray,
@@ -1145,6 +1145,11 @@ VIR_ENUM_IMPL(virDomainDiskTray,
"open",
);

Expand All @@ -105,7 +105,7 @@ index 48629c7fed..5151d8a05b 100644
VIR_ENUM_IMPL(virDomainRNGModel,
VIR_DOMAIN_RNG_MODEL_LAST,
"virtio",
@@ -20841,6 +20846,17 @@ virDomainDefParseXML(xmlDocPtr xml,
@@ -21549,6 +21554,17 @@ virDomainDefParseXML(xmlDocPtr xml,
if (virDomainDefParseBootOptions(def, ctxt) < 0)
goto error;

Expand All @@ -123,7 +123,7 @@ index 48629c7fed..5151d8a05b 100644
/* analysis of the disk devices */
if ((n = virXPathNodeSet("./devices/disk", ctxt, &nodes)) < 0)
goto error;
@@ -23278,6 +23294,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
@@ -24066,6 +24082,14 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
goto error;
}

Expand All @@ -138,7 +138,7 @@ index 48629c7fed..5151d8a05b 100644
if (!virDomainDefFeaturesCheckABIStability(src, dst))
goto error;

@@ -28730,8 +28754,21 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
@@ -29725,8 +29749,21 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
virBufferAddLit(buf, "<devices>\n");
virBufferAdjustIndent(buf, 2);

Expand All @@ -163,10 +163,10 @@ index 48629c7fed..5151d8a05b 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 87afd9bda4..75bee12477 100644
index 9b92b86caa..dff3e65c72 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2096,6 +2096,13 @@ struct _virBlkioDevice {
@@ -2202,6 +2202,13 @@ struct _virBlkioDevice {
unsigned long long wbps;
};

Expand All @@ -180,7 +180,7 @@ index 87afd9bda4..75bee12477 100644
typedef enum {
VIR_DOMAIN_RNG_MODEL_VIRTIO,
VIR_DOMAIN_RNG_MODEL_VIRTIO_TRANSITIONAL,
@@ -2421,6 +2428,8 @@ struct _virDomainDef {
@@ -2532,6 +2539,8 @@ struct _virDomainDef {

virDomainOSDef os;
char *emulator;
Expand All @@ -189,19 +189,19 @@ index 87afd9bda4..75bee12477 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. */
@@ -3467,6 +3476,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode);
VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy);
VIR_ENUM_DECL(virDomainHyperv);
@@ -3589,6 +3598,7 @@ VIR_ENUM_DECL(virDomainHyperv);
VIR_ENUM_DECL(virDomainKVM);
VIR_ENUM_DECL(virDomainXen);
VIR_ENUM_DECL(virDomainXenPassthroughMode);
+VIR_ENUM_DECL(virDomainEmulatorType);
VIR_ENUM_DECL(virDomainMsrsUnknown);
VIR_ENUM_DECL(virDomainRNGModel);
VIR_ENUM_DECL(virDomainRNGBackend);
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 0db9518f6b..0c62c11e39 100644
index 74f3bbcae6..bae9c9bd5a 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -569,6 +569,23 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
@@ -593,6 +593,23 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
b_info->device_model_version = libxlDomainGetEmulatorType(def);
}

Expand All @@ -226,5 +226,5 @@ index 0db9518f6b..0c62c11e39 100644
if (def->nserials == 1) {
if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) <
--
2.21.0
2.21.1

10 changes: 5 additions & 5 deletions 0004-libxl-support-domain-config-modification-in-virDomai.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c4346bb9a8ad507dc2cb2ee2b39a3742b0ba3f68 Mon Sep 17 00:00:00 2001
From 6b2ea15939f3052cb37ead333a82c8861eb1040e 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
Expand All @@ -15,10 +15,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 f021ec9c5d..f9ed60f194 100644
index 980984b199..6e53f37dbf 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -1959,11 +1959,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
@@ -1969,11 +1969,6 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
#endif

virCheckFlags(VIR_DOMAIN_SAVE_PAUSED, -1);
Expand All @@ -30,7 +30,7 @@ index f021ec9c5d..f9ed60f194 100644

fd = libxlDomainSaveImageOpen(driver, cfg, from, &def, &hdr);
if (fd < 0)
@@ -1972,6 +1967,18 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
@@ -1982,6 +1977,18 @@ libxlDomainRestoreFlags(virConnectPtr conn, const char *from,
if (virDomainRestoreFlagsEnsureACL(conn, def) < 0)
goto cleanup;

Expand All @@ -50,5 +50,5 @@ index f021ec9c5d..f9ed60f194 100644
driver->xmlopt,
VIR_DOMAIN_OBJ_LIST_ADD_LIVE |
--
2.21.0
2.21.1

Loading

0 comments on commit cfedef8

Please sign in to comment.