pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 603329 from home:jfehlig:branches:Virtualization

Browse Source 
- Update to libvirt 4.3.0
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Remove legacy Xen driver
  - Dropped patches:
    09877303-virSocketAddrParseInternal.patch,
    412afdb8-intro-virSocketAddrParseAny.patch

OBS-URL: https://build.opensuse.org/request/show/603329
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=685
This commit is contained in:
James Fehlig 2018-05-02 22:39:32 +00:00 committed by Git OBS Bridge
parent 9462ef6485
commit b81961b485
35 changed files with 243 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
0001-Extract-stats-functions-from-the-qemu-driver.patch
View File

@ -18,10 +18,10 @@ them.
create mode 100644 src/conf/domain_stats.c create mode 100644 src/conf/domain_stats.c
create mode 100644 src/conf/domain_stats.h create mode 100644 src/conf/domain_stats.h
Index: libvirt-4.2.0/src/conf/domain_stats.c Index: libvirt-4.3.0/src/conf/domain_stats.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-4.2.0/src/conf/domain_stats.c +++ libvirt-4.3.0/src/conf/domain_stats.c
@@ -0,0 +1,139 @@ @@ -0,0 +1,139 @@
+/* +/*
+ * domain_stats.c: domain stats extraction helpers + * domain_stats.c: domain stats extraction helpers
@ -162,10 +162,10 @@ Index: libvirt-4.2.0/src/conf/domain_stats.c
+} +}
+ +
+#undef STATS_ADD_NET_PARAM +#undef STATS_ADD_NET_PARAM
Index: libvirt-4.2.0/src/conf/domain_stats.h Index: libvirt-4.3.0/src/conf/domain_stats.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-4.2.0/src/conf/domain_stats.h +++ libvirt-4.3.0/src/conf/domain_stats.h
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/* +/*
+ * domain_stats.h: domain stats extraction helpers + * domain_stats.h: domain stats extraction helpers
@ -231,11 +231,11 @@ Index: libvirt-4.2.0/src/conf/domain_stats.h
+ int *maxparams); + int *maxparams);
+ +
+#endif /* __DOMAIN_STATS_H */ +#endif /* __DOMAIN_STATS_H */
Index: libvirt-4.2.0/src/libvirt_private.syms Index: libvirt-4.3.0/src/libvirt_private.syms
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libvirt_private.syms --- libvirt-4.3.0.orig/src/libvirt_private.syms
+++ libvirt-4.2.0/src/libvirt_private.syms +++ libvirt-4.3.0/src/libvirt_private.syms
@@ -646,6 +646,9 @@ virDomainConfNWFilterRegister; @@ -649,6 +649,9 @@ virDomainConfNWFilterRegister;
virDomainConfNWFilterTeardown; virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown; virDomainConfVMNWFilterTeardown;
@ -245,7 +245,7 @@ Index: libvirt-4.2.0/src/libvirt_private.syms
# conf/interface_conf.h # conf/interface_conf.h
virInterfaceDefFormat; virInterfaceDefFormat;
@@ -1507,6 +1510,7 @@ virCgroupGetMemoryUsage; @@ -1508,6 +1511,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage; virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats; virCgroupGetPercpuStats;
@ -253,11 +253,11 @@ Index: libvirt-4.2.0/src/libvirt_private.syms
virCgroupHasController; virCgroupHasController;
virCgroupHasEmptyTasks; virCgroupHasEmptyTasks;
virCgroupKill; virCgroupKill;
Index: libvirt-4.2.0/src/qemu/qemu_driver.c Index: libvirt-4.3.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu_driver.c --- libvirt-4.3.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.2.0/src/qemu/qemu_driver.c +++ libvirt-4.3.0/src/qemu/qemu_driver.c
@@ -73,6 +73,7 @@ @@ -74,6 +74,7 @@
#include "virarptable.h" #include "virarptable.h"
#include "viruuid.h" #include "viruuid.h"
#include "domain_conf.h" #include "domain_conf.h"
@ -265,7 +265,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
#include "domain_audit.h" #include "domain_audit.h"
#include "node_device_conf.h" #include "node_device_conf.h"
#include "virpci.h" #include "virpci.h"
@@ -19528,21 +19529,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr @@ -19508,21 +19509,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
int *maxparams, int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED) unsigned int privflags ATTRIBUTE_UNUSED)
{ {
@ -288,7 +288,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
} }
@@ -19565,37 +19552,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d @@ -19545,37 +19532,7 @@ qemuDomainGetStatsCpu(virQEMUDriverPtr d
unsigned int privflags ATTRIBUTE_UNUSED) unsigned int privflags ATTRIBUTE_UNUSED)
{ {
qemuDomainObjPrivatePtr priv = dom->privateData; qemuDomainObjPrivatePtr priv = dom->privateData;
@ -327,7 +327,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
} }
static int static int
@@ -19774,44 +19731,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr @@ -19754,44 +19711,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
return ret; return ret;
} }
@ -372,7 +372,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
static int static int
qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
virDomainObjPtr dom, virDomainObjPtr dom,
@@ -19819,68 +19738,9 @@ qemuDomainGetStatsInterface(virQEMUDrive @@ -19799,68 +19718,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
int *maxparams, int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED) unsigned int privflags ATTRIBUTE_UNUSED)
{ {
@ -442,7 +442,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
#define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \ #define QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, num, name, value) \
do { \ do { \
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
@@ -20002,10 +19862,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver @@ -19982,10 +19842,10 @@ qemuDomainGetStatsOneBlock(virQEMUDriver
if (disk->info.alias) if (disk->info.alias)
alias = qemuDomainStorageAlias(disk->info.alias, backing_idx); alias = qemuDomainStorageAlias(disk->info.alias, backing_idx);
@ -455,7 +455,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
block_idx, src->path); block_idx, src->path);
if (backing_idx) if (backing_idx)
QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex", QEMU_ADD_BLOCK_PARAM_UI(record, maxparams, block_idx, "backingIndex",
@@ -20121,7 +19981,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr @@ -20101,7 +19961,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
* after the iteration than it is to iterate twice; but we still * after the iteration than it is to iterate twice; but we still
* want count listed first. */ * want count listed first. */
count_index = record->nparams; count_index = record->nparams;
@ -464,7 +464,7 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
for (i = 0; i < dom->def->ndisks; i++) { for (i = 0; i < dom->def->ndisks; i++) {
virDomainDiskDefPtr disk = dom->def->disks[i]; virDomainDiskDefPtr disk = dom->def->disks[i];
@@ -20155,10 +20015,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr @@ -20135,10 +19995,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
#undef QEMU_ADD_BLOCK_PARAM_ULL #undef QEMU_ADD_BLOCK_PARAM_ULL
@ -475,10 +475,10 @@ Index: libvirt-4.2.0/src/qemu/qemu_driver.c
static int static int
qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
virPerfEventType type, virPerfEventType type,
Index: libvirt-4.2.0/src/util/vircgroup.c Index: libvirt-4.3.0/src/util/vircgroup.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/util/vircgroup.c --- libvirt-4.3.0.orig/src/util/vircgroup.c
+++ libvirt-4.2.0/src/util/vircgroup.c +++ libvirt-4.3.0/src/util/vircgroup.c
@@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control @@ -4122,6 +4122,44 @@ virCgroupControllerAvailable(int control
return ret; return ret;
} }
@ -539,10 +539,10 @@ Index: libvirt-4.2.0/src/util/vircgroup.c
#endif /* !VIR_CGROUP_SUPPORTED */ #endif /* !VIR_CGROUP_SUPPORTED */
Index: libvirt-4.2.0/src/util/vircgroup.h Index: libvirt-4.3.0/src/util/vircgroup.h
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/util/vircgroup.h --- libvirt-4.3.0.orig/src/util/vircgroup.h
+++ libvirt-4.2.0/src/util/vircgroup.h +++ libvirt-4.3.0/src/util/vircgroup.h
@@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou @@ -297,4 +297,8 @@ int virCgroupSetOwner(virCgroupPtr cgrou
int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
@ -552,10 +552,10 @@ Index: libvirt-4.2.0/src/util/vircgroup.h
+ virDomainStatsRecordPtr record, + virDomainStatsRecordPtr record,
+ int *maxparams); + int *maxparams);
#endif /* __VIR_CGROUP_H__ */ #endif /* __VIR_CGROUP_H__ */
Index: libvirt-4.2.0/src/conf/Makefile.inc.am Index: libvirt-4.3.0/src/conf/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/conf/Makefile.inc.am --- libvirt-4.3.0.orig/src/conf/Makefile.inc.am
+++ libvirt-4.2.0/src/conf/Makefile.inc.am +++ libvirt-4.3.0/src/conf/Makefile.inc.am
@@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \ @@ -20,6 +20,8 @@ DOMAIN_CONF_SOURCES = \
conf/domain_audit.h \ conf/domain_audit.h \
conf/domain_nwfilter.c \ conf/domain_nwfilter.c \

10
0002-lxc-implement-connectGetAllDomainStats.patch
View File

@ -9,10 +9,10 @@ them using the existing API.
src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lxc/lxc_driver.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 138 insertions(+) 1 file changed, 138 insertions(+)
Index: libvirt-4.2.0/src/lxc/lxc_driver.c Index: libvirt-4.3.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/lxc/lxc_driver.c --- libvirt-4.3.0.orig/src/lxc/lxc_driver.c
+++ libvirt-4.2.0/src/lxc/lxc_driver.c +++ libvirt-4.3.0/src/lxc/lxc_driver.c
@@ -80,6 +80,7 @@ @@ -80,6 +80,7 @@
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
#include "virhostdev.h" #include "virhostdev.h"
@ -21,7 +21,7 @@ Index: libvirt-4.2.0/src/lxc/lxc_driver.c
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -5528,6 +5529,142 @@ lxcDomainHasManagedSaveImage(virDomainPt @@ -5524,6 +5525,142 @@ lxcDomainHasManagedSaveImage(virDomainPt
return ret; return ret;
} }
@ -164,7 +164,7 @@ Index: libvirt-4.2.0/src/lxc/lxc_driver.c
/* Function Tables */ /* Function Tables */
static virHypervisorDriver lxcHypervisorDriver = { static virHypervisorDriver lxcHypervisorDriver = {
@@ -5622,6 +5759,7 @@ static virHypervisorDriver lxcHypervisor @@ -5619,6 +5756,7 @@ static virHypervisorDriver lxcHypervisor
.nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */ .nodeGetFreePages = lxcNodeGetFreePages, /* 1.2.6 */
.nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */ .nodeAllocPages = lxcNodeAllocPages, /* 1.2.9 */
.domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */ .domainHasManagedSaveImage = lxcDomainHasManagedSaveImage, /* 1.2.13 */

23
09877303-virSocketAddrParseInternal.patch
View File

@ -1,23 +0,0 @@
commit 09877303014e0297d2c2707be5167d932cc3f425
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon Mar 26 13:00:25 2018 -0600
util: honor reportError parameter in virSocketAddrParseInternal
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
Index: libvirt-4.2.0/src/util/virsocketaddr.c
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.c
+++ libvirt-4.2.0/src/util/virsocketaddr.c
@@ -107,7 +107,8 @@ virSocketAddrParseInternal(struct addrin
int err;
if (val == NULL) {
- virReportError(VIR_ERR_INVALID_ARG, "%s", _("Missing address"));
+ if (reportError)
+ virReportError(VIR_ERR_INVALID_ARG, "%s", _("Missing address"));
return -1;
}

159
412afdb8-intro-virSocketAddrParseAny.patch
View File

@ -1,159 +0,0 @@
commit 412afdb8f4f3f097d6baad3acaeb9e26dfd15836
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon Mar 26 12:53:05 2018 -0600
util: introduce virSocketAddrParseAny
When preparing for migration, the libxl driver creates a new TCP listen
socket for the incoming migration by calling virNetSocketNewListenTCP,
passing the destination host name. virNetSocketNewListenTCP calls
virSocketAddrParse to check if the host name is a wildcard address, in
which case it avoids adding the AI_ADDRCONFIG flag to the hints passed to
getaddrinfo. If the host name is not an IP address, virSocketAddrParse
reports an error
error : virSocketAddrParseInternal:121 : Cannot parse socket address
'myhost.example.com': Name or service not known
But virNetSocketNewListenTCP succeeds regardless and the overall migration
operation succeeds.
Introduce virSocketAddrParseAny and use it when simply testing if a host
name/addr is parsable.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
Index: libvirt-4.2.0/src/libvirt_private.syms
===================================================================
--- libvirt-4.2.0.orig/src/libvirt_private.syms
+++ libvirt-4.2.0/src/libvirt_private.syms
@@ -2725,6 +2725,7 @@ virSocketAddrMask;
virSocketAddrMaskByPrefix;
virSocketAddrNumericFamily;
virSocketAddrParse;
+virSocketAddrParseAny;
virSocketAddrParseIPv4;
virSocketAddrParseIPv6;
virSocketAddrPrefixToNetmask;
Index: libvirt-4.2.0/src/rpc/virnetsocket.c
===================================================================
--- libvirt-4.2.0.orig/src/rpc/virnetsocket.c
+++ libvirt-4.2.0/src/rpc/virnetsocket.c
@@ -333,7 +333,7 @@ int virNetSocketNewListenTCP(const char
* startup in most cases.
*/
if (nodename &&
- !(virSocketAddrParse(&tmp_addr, nodename, AF_UNSPEC) > 0 &&
+ !(virSocketAddrParseAny(&tmp_addr, nodename, AF_UNSPEC, false) > 0 &&
virSocketAddrIsWildcard(&tmp_addr)))
hints.ai_flags |= AI_ADDRCONFIG;
Index: libvirt-4.2.0/src/util/virsocketaddr.c
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.c
+++ libvirt-4.2.0/src/util/virsocketaddr.c
@@ -101,6 +101,7 @@ static int
virSocketAddrParseInternal(struct addrinfo **res,
const char *val,
int family,
+ int ai_flags,
bool reportError)
{
struct addrinfo hints;
@@ -114,7 +115,7 @@ virSocketAddrParseInternal(struct addrin
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
- hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_flags = ai_flags;
if ((err = getaddrinfo(val, NULL, &hints, res)) != 0) {
if (reportError)
virReportError(VIR_ERR_SYSTEM_ERROR,
@@ -143,7 +144,7 @@ int virSocketAddrParse(virSocketAddrPtr
int len;
struct addrinfo *res;
- if (virSocketAddrParseInternal(&res, val, family, true) < 0)
+ if (virSocketAddrParseInternal(&res, val, family, AI_NUMERICHOST, true) < 0)
return -1;
if (res == NULL) {
@@ -163,6 +164,52 @@ int virSocketAddrParse(virSocketAddrPtr
return len;
}
+/**
+ * virSocketAddrParseAny:
+ * @addr: where to store the return value, optional.
+ * @val: a network host name or a numeric network address IPv4 or IPv6
+ * @family: address family to pass down to getaddrinfo
+ * @reportError: boolean to control error reporting
+ *
+ * Mostly a wrapper for getaddrinfo() extracting the address storage
+ * from a host name like acme.example.com or a numeric string like 1.2.3.4
+ * or 2001:db8:85a3:0:0:8a2e:370:7334.
+ *
+ * When @val is a network host name, this function may be susceptible to a
+ * delay due to potentially lengthy netork host address lookups.
+ *
+ * Returns the length of the network address or -1 in case of error.
+ */
+int virSocketAddrParseAny(virSocketAddrPtr addr,
+ const char *val,
+ int family,
+ bool reportError)
+{
+ int len;
+ struct addrinfo *res;
+
+ if (virSocketAddrParseInternal(&res, val, family, 0, reportError) < 0)
+ return -1;
+
+ if (res == NULL) {
+ if (reportError) {
+ virReportError(VIR_ERR_SYSTEM_ERROR,
+ _("No socket addresses found for '%s'"),
+ val);
+ }
+ return -1;
+ }
+
+ len = res->ai_addrlen;
+ if (addr != NULL) {
+ memcpy(&addr->data.stor, res->ai_addr, len);
+ addr->len = res->ai_addrlen;
+ }
+
+ freeaddrinfo(res);
+ return len;
+}
+
/*
* virSocketAddrParseIPv4:
* @val: an IPv4 numeric address
@@ -1105,7 +1152,7 @@ virSocketAddrNumericFamily(const char *a
struct addrinfo *res;
unsigned short family;
- if (virSocketAddrParseInternal(&res, address, AF_UNSPEC, false) < 0)
+ if (virSocketAddrParseInternal(&res, address, AF_UNSPEC, AI_NUMERICHOST, false) < 0)
return -1;
family = res->ai_addr->sa_family;
Index: libvirt-4.2.0/src/util/virsocketaddr.h
===================================================================
--- libvirt-4.2.0.orig/src/util/virsocketaddr.h
+++ libvirt-4.2.0/src/util/virsocketaddr.h
@@ -92,6 +92,11 @@ int virSocketAddrParse(virSocketAddrPtr
const char *val,
int family);
+int virSocketAddrParseAny(virSocketAddrPtr addr,
+ const char *val,
+ int family,
+ bool reportError);
+
int virSocketAddrParseIPv4(virSocketAddrPtr addr,
const char *val);

6
apparmor-no-mount.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-4.2.0/examples/apparmor/libvirt-lxc Index: libvirt-4.3.0/examples/apparmor/libvirt-lxc
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/examples/apparmor/libvirt-lxc --- libvirt-4.3.0.orig/examples/apparmor/libvirt-lxc
+++ libvirt-4.2.0/examples/apparmor/libvirt-lxc +++ libvirt-4.3.0/examples/apparmor/libvirt-lxc
@@ -2,39 +2,15 @@ @@ -2,39 +2,15 @@
#include <abstractions/base> #include <abstractions/base>

8
blockcopy-check-dst-identical-device.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Chunyan Liu <cyliu@suse.com>
src/qemu/qemu_driver.c | 7 +++++++ src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+) 1 file changed, 7 insertions(+)
Index: libvirt-4.2.0/src/qemu/qemu_driver.c Index: libvirt-4.3.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu_driver.c --- libvirt-4.3.0.orig/src/qemu/qemu_driver.c
+++ libvirt-4.2.0/src/qemu/qemu_driver.c +++ libvirt-4.3.0/src/qemu/qemu_driver.c
@@ -17285,6 +17285,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt @@ -17293,6 +17293,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
goto endjob; goto endjob;
} }

3
libvirt-4.2.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a98ea4417811a24d2cf7be776c102919ae6376d28820b153686b018cb8f015b
size 15180120

10
libvirt-4.2.0.tar.xz.asc
View File

@ -1,10 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJawJF8AAoJEBVYiyZZa+pdMlMH/jVktHPj/ZxVyP+sUrlknhPw
IONmqaXw2bqsRvQnIMC2jIap+XQgwElQqYarcgwMvn0DODpo58mKq19fYBqEAQTx
jvpdCfoNMQ3ki2dxJ9fu+8TYq+oGv/axDYWe6TepV032oE/3C77KwPxxzTeIJe2p
bir0LS8SPNXHiGa+Yr6TwPnByq49qp+0EfIjTA8vgnFemU9iGqh85waSAeU1zHRC
EMSQevtDtW6hMn6yRHywZurvWIyyb8n0VQfgsgiX0gy2JnNpnOSwmtENJJQ86qQS
uMNu1RtdYwGe8CmZZvC2HbelXOvMbtdkr2mP8yWACh8DlNo7mTowp6hXIsJPxxA=
=Rmql
-----END PGP SIGNATURE-----

3
libvirt-4.3.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a531e22c8b985ecb2d1223b913fd6ec0f1800e3ebe02351924274885db20c2b7
size 14667860

10
libvirt-4.3.0.tar.xz.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABAgAGBQJa6a7HAAoJEBVYiyZZa+pdvAoIALsZwGBIlMfuJYbhnMVYIgpj
sFKFYy4v/0w8tvXurhVXFo724fCREaqr30RebmktMYRN9V891Q6Brvf6PGH0Zoiu
9ZmxYE3wnQh+4qoccOy0A2opjmnsXBp0DCWgsIg8TTb7stUSYQ6vMzgH8v1ozR6J
yR5dkqdghTz3KRmRY68uZY/QqULl7//ye3ZAF1erNm9MIq3i6BdxSS55pBCJvMqU
RO3UeyKIVhQ3R7p1T/ZtNrtx1EL6NQ30HWp7DrcLUX9S9hnKA2Xf1Pj34IZvjUTm
GSedEVeewJW2qpO2eMb4G4Zv5qGPi/oYLe1V3BXaw/hKYenVmDCp1arGa1CtBN8=
=fuwj
-----END PGP SIGNATURE-----

6
libvirt-power8-models.patch
View File

@ -2,10 +2,10 @@ Add POWER8 v2.0 and v2.1 to cpu map XML
From: <ro@suse.de> From: <ro@suse.de>
Index: libvirt-4.2.0/src/cpu/cpu_map.xml Index: libvirt-4.3.0/src/cpu/cpu_map.xml
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/cpu/cpu_map.xml --- libvirt-4.3.0.orig/src/cpu/cpu_map.xml
+++ libvirt-4.2.0/src/cpu/cpu_map.xml +++ libvirt-4.3.0/src/cpu/cpu_map.xml
@@ -2349,6 +2349,8 @@ @@ -2349,6 +2349,8 @@
<pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/>

52
libvirt-suse-netcontrol.patch
View File

@ -1,36 +1,36 @@
Index: libvirt-4.2.0/configure.ac Index: libvirt-4.3.0/configure.ac
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/configure.ac --- libvirt-4.3.0.orig/configure.ac
+++ libvirt-4.2.0/configure.ac +++ libvirt-4.3.0/configure.ac
@@ -258,6 +258,7 @@ LIBVIRT_ARG_LIBSSH @@ -257,6 +257,7 @@ LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML LIBVIRT_ARG_LIBXML
LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_MACVTAP
LIBVIRT_ARG_NETCF LIBVIRT_ARG_NETCF
+LIBVIRT_ARG_NETCONTROL +LIBVIRT_ARG_NETCONTROL
LIBVIRT_ARG_NLS
LIBVIRT_ARG_NSS LIBVIRT_ARG_NSS
LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_NUMACTL
LIBVIRT_ARG_OPENWSMAN
@@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH @@ -299,6 +300,7 @@ LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_LIBXML
LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_MACVTAP
LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NETCF
+LIBVIRT_CHECK_NETCONTROL +LIBVIRT_CHECK_NETCONTROL
LIBVIRT_CHECK_NLS
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
LIBVIRT_CHECK_OPENWSMAN @@ -966,6 +968,7 @@ LIBVIRT_RESULT_LIBXL
@@ -994,6 +996,7 @@ LIBVIRT_RESULT_LIBXL
LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_LIBXML
LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_MACVTAP
LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NETCF
+LIBVIRT_RESULT_NETCONTROL +LIBVIRT_RESULT_NETCONTROL
LIBVIRT_RESULT_NLS
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
LIBVIRT_RESULT_OPENWSMAN Index: libvirt-4.3.0/tools/virsh.c
Index: libvirt-4.2.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/virsh.c --- libvirt-4.3.0.orig/tools/virsh.c
+++ libvirt-4.2.0/tools/virsh.c +++ libvirt-4.3.0/tools/virsh.c
@@ -578,6 +578,8 @@ virshShowVersion(vshControl *ctl ATTRIBU @@ -575,6 +575,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
vshPrint(ctl, " netcf"); vshPrint(ctl, " netcf");
@ -39,10 +39,10 @@ Index: libvirt-4.2.0/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c Index: libvirt-4.3.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/interface/interface_backend_netcf.c --- libvirt-4.3.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-4.2.0/src/interface/interface_backend_netcf.c +++ libvirt-4.3.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>
@ -57,7 +57,7 @@ Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c
#include "virerror.h" #include "virerror.h"
#include "datatypes.h" #include "datatypes.h"
@@ -67,6 +72,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState @@ -65,6 +70,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
static virNetcfDriverStatePtr driver; static virNetcfDriverStatePtr driver;
@ -95,7 +95,7 @@ Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c
static void static void
virNetcfDriverStateDispose(void *obj) virNetcfDriverStateDispose(void *obj)
@@ -91,6 +127,10 @@ netcfStateInitialize(bool privileged, @@ -89,6 +125,10 @@ netcfStateInitialize(bool privileged,
driver->privileged = privileged; driver->privileged = privileged;
@ -106,7 +106,7 @@ Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c
/* open netcf */ /* open netcf */
if (ncf_init(&driver->netcf, NULL) != 0) { if (ncf_init(&driver->netcf, NULL) != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -1238,6 +1278,19 @@ static virStateDriver interfaceStateDriv @@ -1225,6 +1265,19 @@ static virStateDriver interfaceStateDriv
int netcfIfaceRegister(void) int netcfIfaceRegister(void)
{ {
@ -126,10 +126,10 @@ Index: libvirt-4.2.0/src/interface/interface_backend_netcf.c
if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0) if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
return -1; return -1;
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
Index: libvirt-4.2.0/src/interface/interface_driver.c Index: libvirt-4.3.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/interface/interface_driver.c --- libvirt-4.3.0.orig/src/interface/interface_driver.c
+++ libvirt-4.2.0/src/interface/interface_driver.c +++ libvirt-4.3.0/src/interface/interface_driver.c
@@ -30,8 +30,15 @@ interfaceRegister(void) @@ -30,8 +30,15 @@ interfaceRegister(void)
if (netcfIfaceRegister() == 0) if (netcfIfaceRegister() == 0)
return 0; return 0;
@ -147,10 +147,10 @@ Index: libvirt-4.2.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-4.2.0/m4/virt-netcontrol.m4 Index: libvirt-4.3.0/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-4.2.0/m4/virt-netcontrol.m4 +++ libvirt-4.3.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl
@ -191,10 +191,10 @@ Index: libvirt-4.2.0/m4/virt-netcontrol.m4
+AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[ +AC_DEFUN([LIBVIRT_RESULT_NETCONTROL],[
+ LIBVIRT_RESULT_LIB([NETCONTROL]) + LIBVIRT_RESULT_LIB([NETCONTROL])
+]) +])
Index: libvirt-4.2.0/src/interface/Makefile.inc.am Index: libvirt-4.3.0/src/interface/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/interface/Makefile.inc.am --- libvirt-4.3.0.orig/src/interface/Makefile.inc.am
+++ libvirt-4.2.0/src/interface/Makefile.inc.am +++ libvirt-4.3.0/src/interface/Makefile.inc.am
@@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \ @@ -4,6 +4,7 @@ INTERFACE_DRIVER_SOURCES = \
$(NULL) $(NULL)

11
libvirt.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed May 2 21:42:09 UTC 2018 - jfehlig@suse.com
- Update to libvirt 4.3.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Remove legacy Xen driver
- Dropped patches:
09877303-virSocketAddrParseInternal.patch,
412afdb8-intro-virSocketAddrParseAny.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 5 21:08:11 UTC 2018 - jfehlig@suse.com Thu Apr 5 21:08:11 UTC 2018 - jfehlig@suse.com

55
libvirt.spec
View File

@ -22,7 +22,6 @@
%endif %endif
# The hypervisor drivers that run in libvirtd # The hypervisor drivers that run in libvirtd
%define with_xen 0%{!?_without_xen:1}
%define with_qemu 0%{!?_without_qemu:1} %define with_qemu 0%{!?_without_qemu:1}
%define with_lxc 0%{!?_without_lxc:1} %define with_lxc 0%{!?_without_lxc:1}
%define with_uml 0%{!?_without_uml:1} %define with_uml 0%{!?_without_uml:1}
@ -55,21 +54,16 @@
%define with_libssh 0%{!?_without_libssh:0} %define with_libssh 0%{!?_without_libssh:0}
%define with_bash_completion 0%{!?_without_bash_completion:0} %define with_bash_completion 0%{!?_without_bash_completion:0}
# Xen no longer contains xm/xend so disable building the legacy Xen driver
%define with_xen 0
# Set the OS / architecture specific special cases # Set the OS / architecture specific special cases
# Xen is available only on x86_64, armv7 and aarch64 # Xen is available only on x86_64, armv7 and aarch64
%ifnarch x86_64 armv7hl aarch64 %ifnarch x86_64 armv7hl aarch64
%define with_xen 0
%define with_libxl 0 %define with_libxl 0
%endif %endif
# For SLE, further restrict Xen support to x86_64 only # For SLE, further restrict Xen support to x86_64 only
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%ifarch %arm aarch64 %ifarch %arm aarch64
%define with_xen 0
%define with_libxl 0 %define with_libxl 0
%endif %endif
%endif %endif
@ -175,7 +169,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 4.2.0 Version: 4.3.0
Release: 0 Release: 0
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -196,9 +190,6 @@ Requires: %{name}-daemon-driver-qemu = %{version}-%{release}
%if %{with_uml} %if %{with_uml}
Requires: %{name}-daemon-driver-uml = %{version}-%{release} Requires: %{name}-daemon-driver-uml = %{version}-%{release}
%endif %endif
%if %{with_xen}
Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_vbox} %if %{with_vbox}
Requires: %{name}-daemon-driver-vbox = %{version}-%{release} Requires: %{name}-daemon-driver-vbox = %{version}-%{release}
%endif %endif
@ -221,7 +212,7 @@ BuildRequires: libtool
BuildRequires: modutils BuildRequires: modutils
BuildRequires: systemd BuildRequires: systemd
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
BuildRequires: xen-devel BuildRequires: xen-devel
%endif %endif
%if %{with_qemu} %if %{with_qemu}
@ -324,8 +315,6 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 09877303-virSocketAddrParseInternal.patch
Patch1: 412afdb8-intro-virSocketAddrParseAny.patch
# Patches pending upstream review # Patches pending upstream review
Patch100: libxl-dom-reset.patch Patch100: libxl-dom-reset.patch
Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch
@ -681,18 +670,6 @@ an implementation of the hypervisor driver APIs using
User Mode Linux User Mode Linux
%endif %endif
%if %{with_xen}
%package daemon-driver-xen
Summary: Xen driver plugin for the libvirtd daemon
Group: Development/Libraries/C and C++
Requires: %{name}-daemon = %{version}-%{release}
%description daemon-driver-xen
The Xen driver plugin for the libvirtd daemon, providing
an implementation of the hypervisor driver APIs using Xen.
%endif
%if %{with_vbox} %if %{with_vbox}
%package daemon-driver-vbox %package daemon-driver-vbox
@ -778,20 +755,15 @@ Server side daemon and driver required to manage the virtualization
capabilities of UML capabilities of UML
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
%package daemon-xen %package daemon-xen
Summary: Server side daemon & driver required to run XEN guests Summary: Server side daemon & driver required to run XEN guests
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-daemon = %{version}-%{release} Requires: %{name}-daemon = %{version}-%{release}
%if %{with_xen}
Requires: %{name}-daemon-driver-xen = %{version}-%{release}
%endif
%if %{with_libxl}
Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
%endif
Requires: %{name}-daemon-driver-interface = %{version}-%{release} Requires: %{name}-daemon-driver-interface = %{version}-%{release}
Requires: %{name}-daemon-driver-libxl = %{version}-%{release}
Requires: %{name}-daemon-driver-network = %{version}-%{release} Requires: %{name}-daemon-driver-network = %{version}-%{release}
Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} Requires: %{name}-daemon-driver-nodedev = %{version}-%{release}
Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release}
@ -927,8 +899,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch150 -p1 %patch150 -p1
@ -961,11 +931,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%endif %endif
%build %build
%if %{with_xen}
%define arg_xen --with-xen
%else
%define arg_xen --without-xen
%endif
%if %{with_qemu} %if %{with_qemu}
%define arg_qemu --with-qemu %define arg_qemu --with-qemu
%else %else
@ -1084,7 +1049,6 @@ autoreconf -f -i
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export PYTHON=%{_bindir}/python3 export PYTHON=%{_bindir}/python3
%configure --disable-static \ %configure --disable-static \
%{?arg_xen} \
%{?arg_qemu} \ %{?arg_qemu} \
%{?arg_openvz} \ %{?arg_openvz} \
%{?arg_lxc} \ %{?arg_lxc} \
@ -1226,7 +1190,7 @@ Any empty package encapsulating requirements for a libvirtd capable
of managing VirtualBox. of managing VirtualBox.
EOF EOF
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF' cat > %{buildroot}/%{_docdir}/libvirt/libvirt-daemon-xen.README << 'EOF'
Any empty package encapsulating requirements for a libvirtd capable Any empty package encapsulating requirements for a libvirtd capable
of managing Xen. of managing Xen.
@ -1588,13 +1552,6 @@ fi
%{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so
%endif %endif
%if %{with_xen}
%files daemon-driver-xen
%dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so
%endif
%if %{with_libxl} %if %{with_libxl}
%files daemon-driver-libxl %files daemon-driver-libxl
@ -1633,7 +1590,7 @@ fi
%doc %{_docdir}/%{name}/libvirt-daemon-uml.README %doc %{_docdir}/%{name}/libvirt-daemon-uml.README
%endif %endif
%if %{with_xen} || %{with_libxl} %if %{with_libxl}
%files daemon-xen %files daemon-xen
%doc %{_docdir}/%{name}/libvirt-daemon-xen.README %doc %{_docdir}/%{name}/libvirt-daemon-xen.README

10
libxl-dom-reset.patch
View File

@ -8,11 +8,11 @@ Date: Mon Jun 23 15:51:20 2014 -0600
option, but domainReset can be implemented in the libxl driver by option, but domainReset can be implemented in the libxl driver by
forcibly destroying the domain and starting it again. forcibly destroying the domain and starting it again.
Index: libvirt-4.2.0/src/libxl/libxl_driver.c Index: libvirt-4.3.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_driver.c --- libvirt-4.3.0.orig/src/libxl/libxl_driver.c
+++ libvirt-4.2.0/src/libxl/libxl_driver.c +++ libvirt-4.3.0/src/libxl/libxl_driver.c
@@ -1375,6 +1375,61 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1358,6 +1358,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }
static int static int
@ -74,7 +74,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom, libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
@@ -6487,6 +6542,7 @@ static virHypervisorDriver libxlHypervis @@ -6426,6 +6481,7 @@ static virHypervisorDriver libxlHypervis
.domainShutdown = libxlDomainShutdown, /* 0.9.0 */ .domainShutdown = libxlDomainShutdown, /* 0.9.0 */
.domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */ .domainShutdownFlags = libxlDomainShutdownFlags, /* 0.9.10 */
.domainReboot = libxlDomainReboot, /* 0.9.0 */ .domainReboot = libxlDomainReboot, /* 0.9.0 */

6
libxl-qemu-emulator-caps.patch
View File

@ -8,10 +8,10 @@ as the default <emulator>, instead of the qemu-xen one.
See FATE#320638 for details. See FATE#320638 for details.
Index: libvirt-4.2.0/src/libxl/libxl_capabilities.c Index: libvirt-4.3.0/src/libxl/libxl_capabilities.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_capabilities.c --- libvirt-4.3.0.orig/src/libxl/libxl_capabilities.c
+++ libvirt-4.2.0/src/libxl/libxl_capabilities.c +++ libvirt-4.3.0/src/libxl/libxl_capabilities.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include "libxl_capabilities.h" #include "libxl_capabilities.h"
#include "cpu/cpu_x86.h" #include "cpu/cpu_x86.h"

10
libxl-set-cach-mode.patch
View File

@ -3,11 +3,11 @@ https://bugzilla.novell.com/show_bug.cgi?id=879425
src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++ src/libxl/libxl_conf.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+) 1 file changed, 25 insertions(+)
Index: libvirt-4.2.0/src/libxl/libxl_conf.c Index: libvirt-4.3.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_conf.c --- libvirt-4.3.0.orig/src/libxl/libxl_conf.c
+++ libvirt-4.2.0/src/libxl/libxl_conf.c +++ libvirt-4.3.0/src/libxl/libxl_conf.c
@@ -771,6 +771,30 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -837,6 +837,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }
@ -38,7 +38,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_conf.c
static char * static char *
libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
const char *username, const char *username,
@@ -1019,6 +1043,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1085,6 +1109,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0;
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1; return -1;

66
libxl-set-migration-constraints.patch
View File

@ -16,10 +16,10 @@ Signed-off-by: Jim Fehlig <jfehlig@suse.com>
tools/virsh.pod | 8 ++++++++ tools/virsh.pod | 8 ++++++++
6 files changed, 125 insertions(+), 6 deletions(-) 6 files changed, 125 insertions(+), 6 deletions(-)
Index: libvirt-4.2.0/include/libvirt/libvirt-domain.h Index: libvirt-4.3.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/include/libvirt/libvirt-domain.h --- libvirt-4.3.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-4.2.0/include/libvirt/libvirt-domain.h +++ libvirt-4.3.0/include/libvirt/libvirt-domain.h
@@ -1008,6 +1008,31 @@ typedef enum { @@ -1008,6 +1008,31 @@ typedef enum {
*/ */
# define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment" # define VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT "auto_converge.increment"
@ -52,11 +52,11 @@ Index: libvirt-4.2.0/include/libvirt/libvirt-domain.h
/* Domain migration. */ /* Domain migration. */
virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
unsigned long flags, const char *dname, unsigned long flags, const char *dname,
Index: libvirt-4.2.0/src/libxl/libxl_driver.c Index: libvirt-4.3.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_driver.c --- libvirt-4.3.0.orig/src/libxl/libxl_driver.c
+++ libvirt-4.2.0/src/libxl/libxl_driver.c +++ libvirt-4.3.0/src/libxl/libxl_driver.c
@@ -6087,6 +6087,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -6028,6 +6028,9 @@ libxlDomainMigratePerform3Params(virDoma
const char *dname = NULL; const char *dname = NULL;
const char *uri = NULL; const char *uri = NULL;
int ret = -1; int ret = -1;
@ -66,7 +66,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError(); virReportUnsupportedError();
@@ -6103,6 +6106,18 @@ libxlDomainMigratePerform3Params(virDoma @@ -6044,6 +6047,18 @@ libxlDomainMigratePerform3Params(virDoma
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_DEST_NAME, VIR_MIGRATE_PARAM_DEST_NAME,
&dname) < 0 || &dname) < 0 ||
@ -85,7 +85,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI, VIR_MIGRATE_PARAM_URI,
&uri) < 0) &uri) < 0)
@@ -6117,11 +6132,11 @@ libxlDomainMigratePerform3Params(virDoma @@ -6058,11 +6073,11 @@ libxlDomainMigratePerform3Params(virDoma
if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) {
if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml,
@ -99,11 +99,11 @@ Index: libvirt-4.2.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-4.2.0/src/libxl/libxl_migration.c Index: libvirt-4.3.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_migration.c --- libvirt-4.3.0.orig/src/libxl/libxl_migration.c
+++ libvirt-4.2.0/src/libxl/libxl_migration.c +++ libvirt-4.3.0/src/libxl/libxl_migration.c
@@ -359,18 +359,39 @@ libxlMigrateDstReceive(virNetSocketPtr s @@ -356,18 +356,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
static int static int
libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -145,7 +145,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
if (ret != 0) { if (ret != 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to send migration data to destination host")); _("Failed to send migration data to destination host"));
@@ -906,7 +927,7 @@ struct libxlTunnelControl { @@ -903,7 +924,7 @@ struct libxlTunnelControl {
static int static int
libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
@ -154,7 +154,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
virStreamPtr st, virStreamPtr st,
struct libxlTunnelControl **tnl) struct libxlTunnelControl **tnl)
{ {
@@ -939,7 +960,7 @@ libxlMigrationSrcStartTunnel(libxlDriver @@ -936,7 +957,7 @@ libxlMigrationSrcStartTunnel(libxlDriver
virObjectUnlock(vm); virObjectUnlock(vm);
/* Send data to pipe */ /* Send data to pipe */
@ -163,7 +163,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
out: out:
@@ -975,7 +996,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -972,7 +993,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
const char *dconnuri ATTRIBUTE_UNUSED, const char *dconnuri ATTRIBUTE_UNUSED,
const char *dname, const char *dname,
const char *uri, const char *uri,
@ -172,7 +172,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
{ {
virDomainPtr ddomain = NULL; virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
@@ -1015,11 +1036,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1012,11 +1033,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
/* We don't require the destination to have P2P support /* We don't require the destination to have P2P support
* as it looks to be normal migration from the receiver perpective. * as it looks to be normal migration from the receiver perpective.
*/ */
@ -186,7 +186,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
if (!(st = virStreamNew(dconn, 0))) if (!(st = virStreamNew(dconn, 0)))
goto cleanup; goto cleanup;
ret = dconn->driver->domainMigratePrepareTunnel3Params ret = dconn->driver->domainMigratePrepareTunnel3Params
@@ -1033,7 +1054,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1030,7 +1051,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
if (ret == -1) if (ret == -1)
goto cleanup; goto cleanup;
@ -195,7 +195,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
if (uri_out) { if (uri_out) {
if (virTypedParamsReplaceString(&params, &nparams, if (virTypedParamsReplaceString(&params, &nparams,
VIR_MIGRATE_PARAM_URI, uri_out) < 0) { VIR_MIGRATE_PARAM_URI, uri_out) < 0) {
@@ -1048,11 +1069,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1045,11 +1066,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
} }
VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out));
@ -210,7 +210,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
if (ret < 0) if (ret < 0)
orig_err = virSaveLastError(); orig_err = virSaveLastError();
@@ -1083,14 +1104,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1080,14 +1101,14 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
orig_err = virSaveLastError(); orig_err = virSaveLastError();
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -227,7 +227,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
libxlMigrationSrcStopTunnel(tc); libxlMigrationSrcStopTunnel(tc);
virObjectUnref(st); virObjectUnref(st);
} }
@@ -1137,7 +1158,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD @@ -1134,7 +1155,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
const char *dconnuri, const char *dconnuri,
const char *uri_str ATTRIBUTE_UNUSED, const char *uri_str ATTRIBUTE_UNUSED,
const char *dname, const char *dname,
@ -236,7 +236,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
{ {
int ret = -1; int ret = -1;
bool useParams; bool useParams;
@@ -1172,7 +1193,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD @@ -1169,7 +1190,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
} }
ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -245,7 +245,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
cleanup: cleanup:
orig_err = virSaveLastError(); orig_err = virSaveLastError();
@@ -1194,7 +1215,7 @@ libxlDomainMigrationSrcPerform(libxlDriv @@ -1191,7 +1212,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
const char *dconnuri ATTRIBUTE_UNUSED, const char *dconnuri ATTRIBUTE_UNUSED,
const char *uri_str, const char *uri_str,
const char *dname ATTRIBUTE_UNUSED, const char *dname ATTRIBUTE_UNUSED,
@ -254,7 +254,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
{ {
libxlDomainObjPrivatePtr priv = vm->privateData; libxlDomainObjPrivatePtr priv = vm->privateData;
char *hostname = NULL; char *hostname = NULL;
@@ -1234,7 +1255,7 @@ libxlDomainMigrationSrcPerform(libxlDriv @@ -1231,7 +1252,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
/* suspend vm and send saved data to dst through socket fd */ /* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm); virObjectUnlock(vm);
@ -263,10 +263,10 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret < 0) if (ret < 0)
Index: libvirt-4.2.0/src/libxl/libxl_migration.h Index: libvirt-4.3.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_migration.h --- libvirt-4.3.0.orig/src/libxl/libxl_migration.h
+++ libvirt-4.2.0/src/libxl/libxl_migration.h +++ libvirt-4.3.0/src/libxl/libxl_migration.h
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \
VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \
@ -311,10 +311,10 @@ Index: libvirt-4.2.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-4.2.0/tools/virsh-domain.c Index: libvirt-4.3.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/virsh-domain.c --- libvirt-4.3.0.orig/tools/virsh-domain.c
+++ libvirt-4.2.0/tools/virsh-domain.c +++ libvirt-4.3.0/tools/virsh-domain.c
@@ -10545,6 +10545,22 @@ static const vshCmdOptDef opts_migrate[] @@ -10545,6 +10545,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("use TLS for migration") .help = N_("use TLS for migration")
@ -374,10 +374,10 @@ Index: libvirt-4.2.0/tools/virsh-domain.c
if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0) if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
goto out; goto out;
if (opt) { if (opt) {
Index: libvirt-4.2.0/tools/virsh.pod Index: libvirt-4.3.0/tools/virsh.pod
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/virsh.pod --- libvirt-4.3.0.orig/tools/virsh.pod
+++ libvirt-4.2.0/tools/virsh.pod +++ libvirt-4.3.0/tools/virsh.pod
@@ -1850,6 +1850,14 @@ Providing I<--tls> causes the migration @@ -1850,6 +1850,14 @@ Providing I<--tls> causes the migration
the migration of the domain. Usage requires proper TLS setup for both source the migration of the domain. Usage requires proper TLS setup for both source
and target. and target.

14
libxl-support-block-script.patch
View File

@ -7,11 +7,11 @@ and npiv.
For more details, see bsc#954872 and FATE#319810 For more details, see bsc#954872 and FATE#319810
Index: libvirt-4.2.0/src/libxl/libxl_conf.c Index: libvirt-4.3.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/libxl/libxl_conf.c --- libvirt-4.3.0.orig/src/libxl/libxl_conf.c
+++ libvirt-4.2.0/src/libxl/libxl_conf.c +++ libvirt-4.3.0/src/libxl/libxl_conf.c
@@ -771,6 +771,25 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -837,6 +837,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }
@ -37,7 +37,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_conf.c
static void static void
libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode) libxlDiskSetCacheMode(libxl_device_disk *x_disk, int cachemode)
{ {
@@ -916,6 +935,7 @@ libxlMakeNetworkDiskSrc(virStorageSource @@ -982,6 +1001,7 @@ libxlMakeNetworkDiskSrc(virStorageSource
int int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{ {
@ -45,7 +45,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_conf.c
const char *driver = virDomainDiskGetDriver(l_disk); const char *driver = virDomainDiskGetDriver(l_disk);
int format = virDomainDiskGetFormat(l_disk); int format = virDomainDiskGetFormat(l_disk);
int actual_type = virStorageSourceGetActualType(l_disk->src); int actual_type = virStorageSourceGetActualType(l_disk->src);
@@ -931,7 +951,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -997,7 +1017,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0)
return -1; return -1;
} else { } else {
@ -54,7 +54,7 @@ Index: libvirt-4.2.0/src/libxl/libxl_conf.c
return -1; return -1;
} }
@@ -1044,6 +1064,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1110,6 +1130,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk
if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0)
return -1; return -1;
libxlDiskSetCacheMode(x_disk, l_disk->cachemode); libxlDiskSetCacheMode(x_disk, l_disk->cachemode);

24
lxc-wait-after-eth-del.patch
View File

@ -13,10 +13,10 @@ device with the same name that is being created.
src/lxc/lxc_process.c | 1 + src/lxc/lxc_process.c | 1 +
3 files changed, 4 insertions(+) 3 files changed, 4 insertions(+)
Index: libvirt-4.2.0/src/lxc/lxc_controller.c Index: libvirt-4.3.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/lxc/lxc_controller.c --- libvirt-4.3.0.orig/src/lxc/lxc_controller.c
+++ libvirt-4.2.0/src/lxc/lxc_controller.c +++ libvirt-4.3.0/src/lxc/lxc_controller.c
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
#include "rpc/virnetdaemon.h" #include "rpc/virnetdaemon.h"
#include "virstring.h" #include "virstring.h"
@ -33,10 +33,10 @@ Index: libvirt-4.2.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-4.2.0/src/lxc/lxc_driver.c Index: libvirt-4.3.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/lxc/lxc_driver.c --- libvirt-4.3.0.orig/src/lxc/lxc_driver.c
+++ libvirt-4.2.0/src/lxc/lxc_driver.c +++ libvirt-4.3.0/src/lxc/lxc_driver.c
@@ -75,6 +75,7 @@ @@ -75,6 +75,7 @@
#include "virtime.h" #include "virtime.h"
#include "virtypedparam.h" #include "virtypedparam.h"
@ -45,7 +45,7 @@ Index: libvirt-4.2.0/src/lxc/lxc_driver.c
#include "virstring.h" #include "virstring.h"
#include "viraccessapicheck.h" #include "viraccessapicheck.h"
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
@@ -4035,6 +4036,7 @@ lxcDomainAttachDeviceNetLive(virConnectP @@ -4031,6 +4032,7 @@ lxcDomainAttachDeviceNetLive(virConnectP
case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_NETWORK:
case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_ETHERNET:
ignore_value(virNetDevVethDelete(veth)); ignore_value(virNetDevVethDelete(veth));
@ -53,7 +53,7 @@ Index: libvirt-4.2.0/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4478,6 +4480,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -4474,6 +4476,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb
virDomainAuditNet(vm, detach, NULL, "detach", false); virDomainAuditNet(vm, detach, NULL, "detach", false);
goto cleanup; goto cleanup;
} }
@ -61,10 +61,10 @@ Index: libvirt-4.2.0/src/lxc/lxc_driver.c
break; break;
/* It'd be nice to support this, but with macvlan /* It'd be nice to support this, but with macvlan
Index: libvirt-4.2.0/src/lxc/lxc_process.c Index: libvirt-4.3.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/lxc/lxc_process.c --- libvirt-4.3.0.orig/src/lxc/lxc_process.c
+++ libvirt-4.2.0/src/lxc/lxc_process.c +++ libvirt-4.3.0/src/lxc/lxc_process.c
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
#include "viratomic.h" #include "viratomic.h"
#include "virprocess.h" #include "virprocess.h"
@ -73,7 +73,7 @@ Index: libvirt-4.2.0/src/lxc/lxc_process.c
#include "netdev_bandwidth_conf.h" #include "netdev_bandwidth_conf.h"
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -220,6 +221,7 @@ static void virLXCProcessCleanup(virLXCD @@ -216,6 +217,7 @@ static void virLXCProcessCleanup(virLXCD
} }
virDomainNetReleaseActualDevice(vm->def, iface); virDomainNetReleaseActualDevice(vm->def, iface);
} }

14
network-don-t-use-dhcp-authoritative-on-static-netwo.patch
View File

@ -17,11 +17,11 @@ Signed-off-by: Martin Wilck <mwilck@suse.com>
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 - tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
2 files changed, 8 insertions(+), 2 deletions(-) 2 files changed, 8 insertions(+), 2 deletions(-)
Index: libvirt-4.2.0/src/network/bridge_driver.c Index: libvirt-4.3.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/network/bridge_driver.c --- libvirt-4.3.0.orig/src/network/bridge_driver.c
+++ libvirt-4.2.0/src/network/bridge_driver.c +++ libvirt-4.3.0/src/network/bridge_driver.c
@@ -1470,7 +1470,14 @@ networkDnsmasqConfContents(virNetworkObj @@ -1457,7 +1457,14 @@ networkDnsmasqConfContents(virNetworkObj
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
if (ipdef->nranges || ipdef->nhosts) { if (ipdef->nranges || ipdef->nhosts) {
virBufferAddLit(&configbuf, "dhcp-no-override\n"); virBufferAddLit(&configbuf, "dhcp-no-override\n");
@ -37,10 +37,10 @@ Index: libvirt-4.2.0/src/network/bridge_driver.c
} }
if (ipdef->tftproot) { if (ipdef->tftproot) {
Index: libvirt-4.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-4.3.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-4.2.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-4.3.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
@@ -10,7 +10,6 @@ bind-dynamic @@ -10,7 +10,6 @@ bind-dynamic
interface=virbr1 interface=virbr1
dhcp-range=192.168.122.1,static dhcp-range=192.168.122.1,static

6
ppc64le-canonical-name.patch
View File

@ -2,10 +2,10 @@ Canonicalize hostarch name ppc64le to ppc64
See bnc#894956 See bnc#894956
Index: libvirt-4.2.0/src/util/virarch.c Index: libvirt-4.3.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/util/virarch.c --- libvirt-4.3.0.orig/src/util/virarch.c
+++ libvirt-4.2.0/src/util/virarch.c +++ libvirt-4.3.0/src/util/virarch.c
@@ -169,6 +169,8 @@ virArch virArchFromHost(void) @@ -169,6 +169,8 @@ virArch virArchFromHost(void)
arch = VIR_ARCH_I686; arch = VIR_ARCH_I686;
} else if (STREQ(ut.machine, "amd64")) { } else if (STREQ(ut.machine, "amd64")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-4.2.0/examples/apparmor/libvirt-qemu Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu --- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-4.2.0/examples/apparmor/libvirt-qemu +++ libvirt-4.3.0/examples/apparmor/libvirt-qemu
@@ -197,3 +197,6 @@ @@ -197,3 +197,6 @@
# required for sasl GSSAPI plugin # required for sasl GSSAPI plugin
/etc/gss/mech.d/ r, /etc/gss/mech.d/ r,

12
support-managed-pci-xen-driver.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] support managed pci devices in xen driver
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++- src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 15 deletions(-) 2 files changed, 35 insertions(+), 15 deletions(-)
Index: libvirt-4.2.0/src/xenconfig/xen_common.c Index: libvirt-4.3.0/src/xenconfig/xen_common.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/xenconfig/xen_common.c --- libvirt-4.3.0.orig/src/xenconfig/xen_common.c
+++ libvirt-4.2.0/src/xenconfig/xen_common.c +++ libvirt-4.3.0/src/xenconfig/xen_common.c
@@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe @@ -394,6 +394,8 @@ xenParsePCI(virConfPtr conf, virDomainDe
{ {
virConfValuePtr list = virConfGetValue(conf, "pci"); virConfValuePtr list = virConfGetValue(conf, "pci");
@ -66,10 +66,10 @@ Index: libvirt-4.2.0/src/xenconfig/xen_common.c
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
hostdev->source.subsys.u.pci.addr.domain = domainID; hostdev->source.subsys.u.pci.addr.domain = domainID;
hostdev->source.subsys.u.pci.addr.bus = busID; hostdev->source.subsys.u.pci.addr.bus = busID;
Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c
@@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def, @@ -1057,6 +1057,7 @@ xenParseSxprPCI(virDomainDefPtr def,
int busID; int busID;
int slotID; int slotID;

12
suse-apparmor-libnl-paths.patch
View File

@ -8,10 +8,10 @@ It was also noticed that the per-domain profiles need a libnl rule
to squelch a denial when starting confined domains. to squelch a denial when starting confined domains.
Found while investigating bsc#1058847 Found while investigating bsc#1058847
Index: libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-4.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-4.3.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ libvirt-4.3.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ @@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
owner @{PROC}/[0-9]*/status r, owner @{PROC}/[0-9]*/status r,
@{PROC}/filesystems r, @{PROC}/filesystems r,
@ -21,10 +21,10 @@ Index: libvirt-4.2.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
# for hostdev # for hostdev
/sys/devices/ r, /sys/devices/ r,
Index: libvirt-4.2.0/examples/apparmor/libvirt-qemu Index: libvirt-4.3.0/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/examples/apparmor/libvirt-qemu --- libvirt-4.3.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-4.2.0/examples/apparmor/libvirt-qemu +++ libvirt-4.3.0/examples/apparmor/libvirt-qemu
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
#/dev/fb* rw, #/dev/fb* rw,

30
suse-libvirt-guests-service.patch
View File

@ -1,9 +1,9 @@
Adjust libvirt-guests service to conform to SUSE standards Adjust libvirt-guests service to conform to SUSE standards
Index: libvirt-4.2.0/tools/libvirt-guests.init.in Index: libvirt-4.3.0/tools/libvirt-guests.init.in
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/libvirt-guests.init.in --- libvirt-4.3.0.orig/tools/libvirt-guests.init.in
+++ libvirt-4.2.0/tools/libvirt-guests.init.in +++ libvirt-4.3.0/tools/libvirt-guests.init.in
@@ -4,27 +4,27 @@ @@ -4,27 +4,27 @@
# http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html # http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html
# #
@ -46,10 +46,10 @@ Index: libvirt-4.2.0/tools/libvirt-guests.init.in
+ +
exec @libexecdir@/libvirt-guests.sh "$@" exec @libexecdir@/libvirt-guests.sh "$@"
Index: libvirt-4.2.0/tools/libvirt-guests.sh.in Index: libvirt-4.3.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/libvirt-guests.sh.in --- libvirt-4.3.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-4.2.0/tools/libvirt-guests.sh.in +++ libvirt-4.3.0/tools/libvirt-guests.sh.in
@@ -16,14 +16,13 @@ @@ -16,14 +16,13 @@
# License along with this library. If not, see # License along with this library. If not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
@ -151,7 +151,7 @@ Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
eval_gettext "Resuming guests on \$uri URI..."; echo eval_gettext "Resuming guests on \$uri URI..."; echo
for guest in $list; do for guest in $list; do
name=$(guest_name "$uri" "$guest") name=$(guest_name "$uri" "$guest")
@@ -412,7 +440,7 @@ shutdown_guests_parallel() @@ -414,7 +442,7 @@ shutdown_guests_parallel()
timeout=$(($timeout - 1)) timeout=$(($timeout - 1))
if [ $timeout -le 0 ]; then if [ $timeout -le 0 ]; then
eval_gettext "Timeout expired while shutting down domains"; echo eval_gettext "Timeout expired while shutting down domains"; echo
@ -160,7 +160,7 @@ Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
return return
fi fi
else else
@@ -441,7 +469,7 @@ stop() { @@ -443,7 +471,7 @@ stop() {
if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then
gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0"
echo echo
@ -169,7 +169,7 @@ Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
return return
fi fi
fi fi
@@ -489,14 +517,14 @@ stop() { @@ -491,14 +519,14 @@ stop() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
eval_gettext "Failed to list persistent guests on \$uri" eval_gettext "Failed to list persistent guests on \$uri"
echo echo
@ -186,7 +186,7 @@ Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
set +f set +f
return return
fi fi
@@ -555,14 +583,13 @@ gueststatus() { @@ -557,14 +585,13 @@ gueststatus() {
rh_status() { rh_status() {
if [ -f "$LISTFILE" ]; then if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo gettext "stopped, with saved guests"; echo
@ -203,23 +203,23 @@ Index: libvirt-4.2.0/tools/libvirt-guests.sh.in
fi fi
fi fi
} }
@@ -607,4 +634,4 @@ case "$1" in @@ -609,4 +636,4 @@ case "$1" in
usage usage
;; ;;
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-4.2.0/tools/libvirt-guests.sysconf Index: libvirt-4.3.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/tools/libvirt-guests.sysconf --- libvirt-4.3.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-4.2.0/tools/libvirt-guests.sysconf +++ libvirt-4.3.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +
+## Type: string +## Type: string
+## Default: default +## Default: default
# URIs to check for running guests # URIs to check for running guests
# example: URIS='default xen:/// vbox+tcp://host/system lxc:///' # example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
-#URIS=default -#URIS=default
+URIS=default +URIS=default

18
suse-libvirtd-disable-tls.patch
View File

@ -3,10 +3,10 @@ Disable TLS by default
On SUSE distros, the default is for libvirtd to listen only on the On SUSE distros, the default is for libvirtd to listen only on the
Unix Domain Socket. The libvirt client still provides remote access Unix Domain Socket. The libvirt client still provides remote access
via a SSH tunnel. via a SSH tunnel.
Index: libvirt-4.2.0/src/remote/libvirtd.conf Index: libvirt-4.3.0/src/remote/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/remote/libvirtd.conf --- libvirt-4.3.0.orig/src/remote/libvirtd.conf
+++ libvirt-4.2.0/src/remote/libvirtd.conf +++ libvirt-4.3.0/src/remote/libvirtd.conf
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@ -18,10 +18,10 @@ Index: libvirt-4.2.0/src/remote/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to # NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-4.2.0/src/remote/remote_daemon_config.c Index: libvirt-4.3.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/remote/remote_daemon_config.c --- libvirt-4.3.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-4.2.0/src/remote/remote_daemon_config.c +++ libvirt-4.3.0/src/remote/remote_daemon_config.c
@@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -110,7 +110,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0) if (VIR_ALLOC(data) < 0)
return NULL; return NULL;
@ -31,10 +31,10 @@ Index: libvirt-4.2.0/src/remote/remote_daemon_config.c
data->listen_tcp = 0; data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-4.2.0/src/remote/test_libvirtd.aug.in Index: libvirt-4.3.0/src/remote/test_libvirtd.aug.in
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/remote/test_libvirtd.aug.in --- libvirt-4.3.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-4.2.0/src/remote/test_libvirtd.aug.in +++ libvirt-4.3.0/src/remote/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd = @@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG:: ::CONFIG::

6
suse-libvirtd-service-xen.patch
View File

@ -7,10 +7,10 @@ On SUSE distros, we promote libvirt and all the libvirt-based
tools. If a user installs libvirt on their SUSE Xen host, then tools. If a user installs libvirt on their SUSE Xen host, then
libvirt should be king and override xendomains. See bsc#1015348 libvirt should be king and override xendomains. See bsc#1015348
Index: libvirt-4.2.0/src/remote/libvirtd.service.in Index: libvirt-4.3.0/src/remote/libvirtd.service.in
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/remote/libvirtd.service.in --- libvirt-4.3.0.orig/src/remote/libvirtd.service.in
+++ libvirt-4.2.0/src/remote/libvirtd.service.in +++ libvirt-4.3.0/src/remote/libvirtd.service.in
@@ -16,6 +16,8 @@ After=apparmor.service @@ -16,6 +16,8 @@ After=apparmor.service
After=local-fs.target After=local-fs.target
After=remote-fs.target After=remote-fs.target

6
suse-libvirtd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-4.2.0/src/remote/libvirtd.sysconf Index: libvirt-4.3.0/src/remote/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/remote/libvirtd.sysconf --- libvirt-4.3.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-4.2.0/src/remote/libvirtd.sysconf +++ libvirt-4.3.0/src/remote/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

16
suse-ovmf-paths.patch
View File

@ -1,10 +1,10 @@
Adjust paths of OVMF firmwares on SUSE distros Adjust paths of OVMF firmwares on SUSE distros
Index: libvirt-4.2.0/src/qemu/qemu.conf Index: libvirt-4.3.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu.conf --- libvirt-4.3.0.orig/src/qemu/qemu.conf
+++ libvirt-4.2.0/src/qemu/qemu.conf +++ libvirt-4.3.0/src/qemu/qemu.conf
@@ -743,10 +743,9 @@ security_default_confined = 0 @@ -747,10 +747,9 @@ security_default_confined = 0
# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default # for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
# follows this scheme. # follows this scheme.
#nvram = [ #nvram = [
@ -18,11 +18,11 @@ Index: libvirt-4.2.0/src/qemu/qemu.conf
#] #]
# The backend to use for handling stdout/stderr output from # The backend to use for handling stdout/stderr output from
Index: libvirt-4.2.0/src/qemu/qemu_conf.c Index: libvirt-4.3.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu_conf.c --- libvirt-4.3.0.orig/src/qemu/qemu_conf.c
+++ libvirt-4.2.0/src/qemu/qemu_conf.c +++ libvirt-4.3.0/src/qemu/qemu_conf.c
@@ -127,10 +127,9 @@ void qemuDomainCmdlineDefFree(qemuDomain @@ -122,10 +122,9 @@ void qemuDomainCmdlineDefFree(qemuDomain
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
# define DEFAULT_LOADER_NVRAM \ # define DEFAULT_LOADER_NVRAM \

6
suse-qemu-conf.patch
View File

@ -7,10 +7,10 @@ suse-qemu-conf-secdriver.patch, suse-qemu-conf-lockmgr.patch,
etc.), but for now they are all lumped together in this etc.), but for now they are all lumped together in this
single patch. single patch.
Index: libvirt-4.2.0/src/qemu/qemu.conf Index: libvirt-4.3.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/qemu/qemu.conf --- libvirt-4.3.0.orig/src/qemu/qemu.conf
+++ libvirt-4.2.0/src/qemu/qemu.conf +++ libvirt-4.3.0/src/qemu/qemu.conf
@@ -380,11 +380,20 @@ @@ -380,11 +380,20 @@
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
# #

6
suse-virtlockd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust virtlockd sysconfig file to conform to SUSE standards Adjust virtlockd sysconfig file to conform to SUSE standards
Index: libvirt-4.2.0/src/locking/virtlockd.sysconf Index: libvirt-4.3.0/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/locking/virtlockd.sysconf --- libvirt-4.3.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-4.2.0/src/locking/virtlockd.sysconf +++ libvirt-4.3.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +

6
suse-virtlogd-sysconfig-settings.patch
View File

@ -1,9 +1,9 @@
Adjust virtlogd sysconfig file to conform to SUSE standards Adjust virtlogd sysconfig file to conform to SUSE standards
Index: libvirt-4.2.0/src/logging/virtlogd.sysconf Index: libvirt-4.3.0/src/logging/virtlogd.sysconf
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/logging/virtlogd.sysconf --- libvirt-4.3.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-4.2.0/src/logging/virtlogd.sysconf +++ libvirt-4.3.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd +## Path: System/Virtualization/virtlogd
+ +

6
xen-pv-cdrom.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c
@@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un @@ -387,7 +387,7 @@ xenParseSxprVifRate(const char *rate, un
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,

6
xen-sxpr-disk-type.patch
View File

@ -6,10 +6,10 @@ and 'file'. This was implicitly done prior to commit 9673418c.
https://bugzilla.suse.com/show_bug.cgi?id=938228 https://bugzilla.suse.com/show_bug.cgi?id=938228
Index: libvirt-4.2.0/src/xenconfig/xen_sxpr.c Index: libvirt-4.3.0/src/xenconfig/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-4.2.0.orig/src/xenconfig/xen_sxpr.c --- libvirt-4.3.0.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-4.2.0/src/xenconfig/xen_sxpr.c +++ libvirt-4.3.0/src/xenconfig/xen_sxpr.c
@@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -501,10 +501,11 @@ xenParseSxprDisks(virDomainDefPtr def,
omnipotent, we can revisit this, perhaps stat()'ing omnipotent, we can revisit this, perhaps stat()'ing
the src file in question */ the src file in question */