Accepting request 728569 from home:jfehlig:branches:Virtualization

- Update to libvirt 5.7.0
  - Experimental split of libvirtd into separate daemons
  - bsc#1145440, bsc#1145586
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html
  - Dropped patches:
    93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch,
    blockcopy-check-dst-identical-device.patch,
    suse-libvirtd-service-xen.patch

OBS-URL: https://build.opensuse.org/request/show/728569
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=773
This commit is contained in:
James Fehlig 2019-09-05 16:31:28 +00:00 committed by Git OBS Bridge
parent e039ebe6dc
commit c626f4fb31
33 changed files with 461 additions and 351 deletions

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-5.6.0/src/conf/domain_stats.c Index: libvirt-5.7.0/src/conf/domain_stats.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.6.0/src/conf/domain_stats.c +++ libvirt-5.7.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-5.6.0/src/conf/domain_stats.c
+} +}
+ +
+#undef STATS_ADD_NET_PARAM +#undef STATS_ADD_NET_PARAM
Index: libvirt-5.6.0/src/conf/domain_stats.h Index: libvirt-5.7.0/src/conf/domain_stats.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.6.0/src/conf/domain_stats.h +++ libvirt-5.7.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-5.6.0/src/conf/domain_stats.h
+ int *maxparams); + int *maxparams);
+ +
+#endif /* __DOMAIN_STATS_H */ +#endif /* __DOMAIN_STATS_H */
Index: libvirt-5.6.0/src/libvirt_private.syms Index: libvirt-5.7.0/src/libvirt_private.syms
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libvirt_private.syms --- libvirt-5.7.0.orig/src/libvirt_private.syms
+++ libvirt-5.6.0/src/libvirt_private.syms +++ libvirt-5.7.0/src/libvirt_private.syms
@@ -694,6 +694,9 @@ virDomainConfNWFilterInstantiate; @@ -695,6 +695,9 @@ virDomainConfNWFilterInstantiate;
virDomainConfNWFilterTeardown; virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown; virDomainConfVMNWFilterTeardown;
@ -245,7 +245,7 @@ Index: libvirt-5.6.0/src/libvirt_private.syms
# conf/interface_conf.h # conf/interface_conf.h
virInterfaceDefFormat; virInterfaceDefFormat;
@@ -1645,6 +1648,7 @@ virCgroupGetMemoryUsage; @@ -1648,6 +1651,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage; virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats; virCgroupGetPercpuStats;
@ -253,11 +253,11 @@ Index: libvirt-5.6.0/src/libvirt_private.syms
virCgroupHasController; virCgroupHasController;
virCgroupHasEmptyTasks; virCgroupHasEmptyTasks;
virCgroupKillPainfully; virCgroupKillPainfully;
Index: libvirt-5.6.0/src/qemu/qemu_driver.c Index: libvirt-5.7.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu_driver.c --- libvirt-5.7.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.6.0/src/qemu/qemu_driver.c +++ libvirt-5.7.0/src/qemu/qemu_driver.c
@@ -68,6 +68,7 @@ @@ -67,6 +67,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-5.6.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"
@@ -20662,21 +20663,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr @@ -20767,21 +20768,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
int *maxparams, int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED) unsigned int privflags ATTRIBUTE_UNUSED)
{ {
@ -288,7 +288,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
} }
@@ -20866,37 +20853,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj @@ -20998,37 +20985,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
int *maxparams) int *maxparams)
{ {
qemuDomainObjPrivatePtr priv = dom->privateData; qemuDomainObjPrivatePtr priv = dom->privateData;
@ -327,7 +327,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
} }
@@ -21092,44 +21049,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr @@ -21224,44 +21181,6 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
return ret; return ret;
} }
@ -372,7 +372,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
static int static int
qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
virDomainObjPtr dom, virDomainObjPtr dom,
@@ -21137,68 +21056,9 @@ qemuDomainGetStatsInterface(virQEMUDrive @@ -21269,68 +21188,9 @@ qemuDomainGetStatsInterface(virQEMUDrive
int *maxparams, int *maxparams,
unsigned int privflags ATTRIBUTE_UNUSED) unsigned int privflags ATTRIBUTE_UNUSED)
{ {
@ -442,7 +442,7 @@ Index: libvirt-5.6.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]; \
@@ -21431,10 +21291,10 @@ qemuDomainGetStatsBlockExportHeader(virD @@ -21560,10 +21420,10 @@ qemuDomainGetStatsBlockExportHeader(virD
{ {
int ret = -1; int ret = -1;
@ -455,7 +455,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
if (src->id) if (src->id)
QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex", QEMU_ADD_BLOCK_PARAM_UI(records, nrecords, recordnr, "backingIndex",
src->id); src->id);
@@ -21588,7 +21448,7 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr @@ -21717,7 +21577,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-5.6.0/src/qemu/qemu_driver.c
for (i = 0; i < dom->def->ndisks; i++) { for (i = 0; i < dom->def->ndisks; i++) {
if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats, if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats,
@@ -21613,8 +21473,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr @@ -21742,8 +21602,6 @@ qemuDomainGetStatsBlock(virQEMUDriverPtr
#undef QEMU_ADD_BLOCK_PARAM_ULL #undef QEMU_ADD_BLOCK_PARAM_ULL
@ -473,7 +473,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
#define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \ #define QEMU_ADD_IOTHREAD_PARAM_UI(record, maxparams, id, name, value) \
do { \ do { \
char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \ char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; \
@@ -21666,7 +21524,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver @@ -21795,7 +21653,7 @@ qemuDomainGetStatsIOThread(virQEMUDriver
if (niothreads == 0) if (niothreads == 0)
return 0; return 0;
@ -482,7 +482,7 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
for (i = 0; i < niothreads; i++) { for (i = 0; i < niothreads; i++) {
if (iothreads[i]->poll_valid) { if (iothreads[i]->poll_valid) {
@@ -21699,8 +21557,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver @@ -21828,8 +21686,6 @@ qemuDomainGetStatsIOThread(virQEMUDriver
#undef QEMU_ADD_IOTHREAD_PARAM_ULL #undef QEMU_ADD_IOTHREAD_PARAM_ULL
@ -491,10 +491,10 @@ Index: libvirt-5.6.0/src/qemu/qemu_driver.c
static int static int
qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
virPerfEventType type, virPerfEventType type,
Index: libvirt-5.6.0/src/util/vircgroup.c Index: libvirt-5.7.0/src/util/vircgroup.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/util/vircgroup.c --- libvirt-5.7.0.orig/src/util/vircgroup.c
+++ libvirt-5.6.0/src/util/vircgroup.c +++ libvirt-5.7.0/src/util/vircgroup.c
@@ -2791,6 +2791,44 @@ virCgroupControllerAvailable(int control @@ -2791,6 +2791,44 @@ virCgroupControllerAvailable(int control
return ret; return ret;
} }
@ -556,10 +556,10 @@ Index: libvirt-5.6.0/src/util/vircgroup.c
int int
virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED, virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED,
bool create ATTRIBUTE_UNUSED, bool create ATTRIBUTE_UNUSED,
Index: libvirt-5.6.0/src/util/vircgroup.h Index: libvirt-5.7.0/src/util/vircgroup.h
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/util/vircgroup.h --- libvirt-5.7.0.orig/src/util/vircgroup.h
+++ libvirt-5.6.0/src/util/vircgroup.h +++ libvirt-5.7.0/src/util/vircgroup.h
@@ -285,3 +285,7 @@ int virCgroupSetOwner(virCgroupPtr cgrou @@ -285,3 +285,7 @@ int virCgroupSetOwner(virCgroupPtr cgrou
int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller);
@ -568,10 +568,10 @@ Index: libvirt-5.6.0/src/util/vircgroup.h
+int virCgroupGetStatsCpu(virCgroupPtr cgroup, +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
+ virDomainStatsRecordPtr record, + virDomainStatsRecordPtr record,
+ int *maxparams); + int *maxparams);
Index: libvirt-5.6.0/src/conf/Makefile.inc.am Index: libvirt-5.7.0/src/conf/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/conf/Makefile.inc.am --- libvirt-5.7.0.orig/src/conf/Makefile.inc.am
+++ libvirt-5.6.0/src/conf/Makefile.inc.am +++ libvirt-5.7.0/src/conf/Makefile.inc.am
@@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \ @@ -26,6 +26,8 @@ DOMAIN_CONF_SOURCES = \
conf/domain_audit.h \ conf/domain_audit.h \
conf/domain_nwfilter.c \ conf/domain_nwfilter.c \

View File

@ -19,11 +19,11 @@ reworking this patch and submitting it to upstream libvirt.
src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+) 1 file changed, 91 insertions(+)
Index: libvirt-5.6.0/src/libxl/libxl_driver.c Index: libvirt-5.7.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c --- libvirt-5.7.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c +++ libvirt-5.7.0/src/libxl/libxl_driver.c
@@ -5280,6 +5280,97 @@ libxlDomainMemoryStats(virDomainPtr dom, @@ -5290,6 +5290,97 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT #undef LIBXL_SET_MEMSTAT
@ -121,7 +121,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c
static int static int
libxlDomainGetJobInfo(virDomainPtr dom, libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info) virDomainJobInfoPtr info)
@@ -6664,6 +6755,7 @@ static virHypervisorDriver libxlHypervis @@ -6738,6 +6829,7 @@ static virHypervisorDriver libxlHypervis
#endif #endif
.nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetFreeMemory = libxlNodeGetFreeMemory, /* 0.9.0 */
.nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */ .nodeGetCellsFreeMemory = libxlNodeGetCellsFreeMemory, /* 1.1.1 */

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-5.6.0/src/lxc/lxc_driver.c Index: libvirt-5.7.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/lxc/lxc_driver.c --- libvirt-5.7.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.6.0/src/lxc/lxc_driver.c +++ libvirt-5.7.0/src/lxc/lxc_driver.c
@@ -75,6 +75,7 @@ @@ -75,6 +75,7 @@
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
#include "virhostdev.h" #include "virhostdev.h"

View File

@ -1,39 +0,0 @@
From 93c1d5fe7bb7a62ef884eb41b505b2809d1704b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Thu, 8 Aug 2019 13:42:24 +0100
Subject: [PATCH] network: fix ability to use openvswitch with vlans
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Use the correct enum constant when validating vlan usage.
This fixes a merge error in
commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c
Author: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon Sep 3 17:34:22 2018 +0100
network: convert networkAllocateActualDevice to virNetworkPortDef
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
src/network/bridge_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 41fa89a..72e1186 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj,
if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI ||
(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT &&
port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) ||
- (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE &&
+ (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE &&
port->virtPortProfile &&
port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--
2.22.0

View File

@ -1,32 +0,0 @@
From 475b272c126d53f3985860422dc96b01b470423e Mon Sep 17 00:00:00 2001
From: Chunyan Liu <cyliu@suse.com>
Date: Tue, 29 Jul 2014 17:31:28 +0800
Subject: [PATCH] blockcopy: check dst = identical device
Check whether dst is the same device as source, if yes, report
error and exit.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
---
src/qemu/qemu_driver.c | 7 +++++++
1 file changed, 7 insertions(+)
Index: libvirt-5.6.0/src/qemu/qemu_driver.c
===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.6.0/src/qemu/qemu_driver.c
@@ -18403,6 +18403,14 @@ qemuDomainBlockCopyCommon(virDomainObjPt
goto endjob;
}
+ if (STREQ_NULLABLE(realpath(disk->src->path, NULL),
+ realpath(mirror->path, NULL))) {
+ virReportError(VIR_ERR_INVALID_ARG,
+ _("destination '%s' is the same as disk '%s' source"),
+ mirror->path, path);
+ goto endjob;
+ }
+
if (qemuDomainStorageFileInit(driver, vm, mirror, NULL) < 0)
goto endjob;

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl1IZMkACgkQFViLJllr
6l377ggA0/nhSYP9gyfo/KD4jvwuwEVDWMD96kjqxHV9N/Sc8jN03T0k0BUIYJvC
gEFeMIm/e4pxEmQO/fHwTQabM4raccVV/dXMP3FIK7oPJz7lf+x/qCeE15umgmjY
OcGKOy/6pco04MBFUu3ULnC6dZZLTSVrS+yw27vJNRJoB74TqbpvXGOUDkdlDvJP
eWlc2ssBo0st1Ew0tH+Gp9Wmk4tE9ygN2OU2nlxS/V9s1XAGLi+nuj2SNU9FX6pr
3E7xv52FnwOddMnPwUJTT5LByDW+WL3ci5XcQ/JMXj74k3U70mrKKiEeCsNkFPoH
PIX+frHu9OXEyjy2MlljH6bST1G9Wg==
=YV5i
-----END PGP SIGNATURE-----

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

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

11
libvirt-5.7.0.tar.xz.asc Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl1uhdgACgkQFViLJllr
6l0KNQgAlGxX8floI0ZHRtgeqe2mLE548yVnQBz7OHFsFDPSn3DdnLB3vMXe77iP
Bp7T3T7a7O6UqRvrYvcHsFP/UaNQcMvxdljB2M+QNifFRVS/Qbg2M3QZV65xsIaX
EhxmxX4lzIufNu0jUpVUq31kSzgIszzCZBR4UxjE5NB1uD88EbRwEcGFwnVHiPVx
ARUyamKZkT/ugptqRcrM6rC2wwEdXXWa4COGXXVXCJh3UefQyqyxk+iyMtsC0Qde
J5buwnrTwSdRRBZTL90t4c1bcZ130zqrDMvWPGywZ3KAgyk8BVbycqPBtnI4kAvZ
XPfoRg1qn6ppnfuH6aVF2osQ9MkPqg==
=YxDo
-----END PGP SIGNATURE-----

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-5.6.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-5.7.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-5.7.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-5.6.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-5.7.0/src/cpu_map/ppc64_POWER8.xml
@@ -4,5 +4,7 @@ @@ -4,5 +4,7 @@
<pvr value='0x004b0000' mask='0xffff0000'/> <pvr value='0x004b0000' mask='0xffff0000'/>
<pvr value='0x004c0000' mask='0xffff0000'/> <pvr value='0x004c0000' mask='0xffff0000'/>

View File

@ -1,8 +1,8 @@
Index: libvirt-5.6.0/configure.ac Index: libvirt-5.7.0/configure.ac
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/configure.ac --- libvirt-5.7.0.orig/configure.ac
+++ libvirt-5.6.0/configure.ac +++ libvirt-5.7.0/configure.ac
@@ -261,6 +261,7 @@ LIBVIRT_ARG_LIBSSH @@ -285,6 +285,7 @@ LIBVIRT_ARG_LIBSSH
LIBVIRT_ARG_LIBXML LIBVIRT_ARG_LIBXML
LIBVIRT_ARG_MACVTAP LIBVIRT_ARG_MACVTAP
LIBVIRT_ARG_NETCF LIBVIRT_ARG_NETCF
@ -10,7 +10,7 @@ Index: libvirt-5.6.0/configure.ac
LIBVIRT_ARG_NLS LIBVIRT_ARG_NLS
LIBVIRT_ARG_NSS LIBVIRT_ARG_NSS
LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_NUMACTL
@@ -304,6 +305,7 @@ LIBVIRT_CHECK_LIBSSH @@ -328,6 +329,7 @@ LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_LIBXML
LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_MACVTAP
LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NETCF
@ -18,7 +18,7 @@ Index: libvirt-5.6.0/configure.ac
LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NLS
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
@@ -988,6 +990,7 @@ LIBVIRT_RESULT_LIBXL @@ -1025,6 +1027,7 @@ LIBVIRT_RESULT_LIBXL
LIBVIRT_RESULT_LIBXML LIBVIRT_RESULT_LIBXML
LIBVIRT_RESULT_MACVTAP LIBVIRT_RESULT_MACVTAP
LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NETCF
@ -26,10 +26,10 @@ Index: libvirt-5.6.0/configure.ac
LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NLS
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
Index: libvirt-5.6.0/tools/virsh.c Index: libvirt-5.7.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/virsh.c --- libvirt-5.7.0.orig/tools/virsh.c
+++ libvirt-5.6.0/tools/virsh.c +++ libvirt-5.7.0/tools/virsh.c
@@ -561,6 +561,8 @@ virshShowVersion(vshControl *ctl ATTRIBU @@ -561,6 +561,8 @@ virshShowVersion(vshControl *ctl ATTRIBU
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
@ -39,10 +39,10 @@ Index: libvirt-5.6.0/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c Index: libvirt-5.7.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/interface/interface_backend_netcf.c --- libvirt-5.7.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-5.6.0/src/interface/interface_backend_netcf.c +++ libvirt-5.7.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
#include <config.h> #include <config.h>
@ -117,7 +117,7 @@ Index: libvirt-5.6.0/src/interface/interface_backend_netcf.c
+ * TODO: finer-grained check? E.g. is_nm_enabled() + * TODO: finer-grained check? E.g. is_nm_enabled()
+ */ + */
+ if (ncf_init(&netcf, NULL) != 0) { + if (ncf_init(&netcf, NULL) != 0) {
+ VIR_WARN("Failed to intialize libnetcontrol. Management of interface devices is disabled"); + VIR_WARN("Failed to initialize libnetcontrol. Management of interface devices is disabled");
+ return 0; + return 0;
+ } + }
+ +
@ -126,10 +126,10 @@ Index: libvirt-5.6.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-5.6.0/src/interface/interface_driver.c Index: libvirt-5.7.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/interface/interface_driver.c --- libvirt-5.7.0.orig/src/interface/interface_driver.c
+++ libvirt-5.6.0/src/interface/interface_driver.c +++ libvirt-5.7.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-5.6.0/src/interface/interface_driver.c
if (udevIfaceRegister() == 0) if (udevIfaceRegister() == 0)
return 0; return 0;
#endif /* WITH_UDEV */ #endif /* WITH_UDEV */
Index: libvirt-5.6.0/m4/virt-netcontrol.m4 Index: libvirt-5.7.0/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.6.0/m4/virt-netcontrol.m4 +++ libvirt-5.7.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-5.6.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-5.6.0/src/interface/Makefile.inc.am Index: libvirt-5.7.0/src/interface/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/interface/Makefile.inc.am --- libvirt-5.7.0.orig/src/interface/Makefile.inc.am
+++ libvirt-5.6.0/src/interface/Makefile.inc.am +++ libvirt-5.7.0/src/interface/Makefile.inc.am
@@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \
$(NULL) $(NULL)

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Sep 4 20:54:24 UTC 2019 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 5.7.0
- Experimental split of libvirtd into separate daemons
- bsc#1145440, bsc#1145586
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch,
blockcopy-check-dst-identical-device.patch,
suse-libvirtd-service-xen.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 15 19:54:20 UTC 2019 - Martin Wilck <mwilck@suse.com> Thu Aug 15 19:54:20 UTC 2019 - Martin Wilck <mwilck@suse.com>

View File

@ -183,7 +183,7 @@
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 5.6.0 Version: 5.7.0
Release: 0 Release: 0
Summary: Library providing a virtualization API Summary: Library providing a virtualization API
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -337,35 +337,32 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.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
# Need to go upstream # Need to go upstream
Patch150: blockcopy-check-dst-identical-device.patch Patch150: libvirt-power8-models.patch
Patch151: libvirt-power8-models.patch Patch151: ppc64le-canonical-name.patch
Patch152: ppc64le-canonical-name.patch Patch152: libxl-set-migration-constraints.patch
Patch153: libxl-set-migration-constraints.patch Patch153: libxl-set-cach-mode.patch
Patch154: libxl-set-cach-mode.patch Patch154: 0001-Extract-stats-functions-from-the-qemu-driver.patch
Patch155: 0001-Extract-stats-functions-from-the-qemu-driver.patch Patch155: 0002-lxc-implement-connectGetAllDomainStats.patch
Patch156: 0002-lxc-implement-connectGetAllDomainStats.patch Patch156: 0001-libxl-add-support-for-BlockResize-API.patch
Patch157: 0001-libxl-add-support-for-BlockResize-API.patch
# Our patches # Our patches
Patch200: suse-libvirtd-disable-tls.patch Patch200: suse-libvirtd-disable-tls.patch
Patch201: suse-libvirtd-sysconfig-settings.patch Patch201: suse-libvirtd-sysconfig-settings.patch
Patch202: suse-libvirt-guests-service.patch Patch202: suse-libvirt-guests-service.patch
Patch203: suse-virtlockd-sysconfig-settings.patch Patch203: suse-virtlockd-sysconfig-settings.patch
Patch204: suse-virtlogd-sysconfig-settings.patch Patch204: suse-virtlogd-sysconfig-settings.patch
Patch205: suse-libvirtd-service-xen.patch Patch205: suse-qemu-conf.patch
Patch206: suse-qemu-conf.patch Patch206: suse-ovmf-paths.patch
Patch207: suse-ovmf-paths.patch Patch207: suse-apparmor-libnl-paths.patch
Patch208: suse-apparmor-libnl-paths.patch Patch208: support-managed-pci-xen-driver.patch
Patch209: support-managed-pci-xen-driver.patch Patch209: libxl-support-block-script.patch
Patch210: libxl-support-block-script.patch Patch210: qemu-apparmor-screenshot.patch
Patch211: qemu-apparmor-screenshot.patch Patch211: libvirt-suse-netcontrol.patch
Patch212: libvirt-suse-netcontrol.patch Patch212: lxc-wait-after-eth-del.patch
Patch213: lxc-wait-after-eth-del.patch Patch213: suse-libxl-disable-autoballoon.patch
Patch214: suse-libxl-disable-autoballoon.patch
# SLES-Only patches # SLES-Only patches
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
Patch400: virt-create-rootfs.patch Patch400: virt-create-rootfs.patch
@ -870,7 +867,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch100 -p1 %patch100 -p1
%patch101 -p1 %patch101 -p1
%patch150 -p1 %patch150 -p1
@ -880,7 +876,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch154 -p1 %patch154 -p1
%patch155 -p1 %patch155 -p1
%patch156 -p1 %patch156 -p1
%patch157 -p1
%patch200 -p1 %patch200 -p1
%patch201 -p1 %patch201 -p1
%patch202 -p1 %patch202 -p1
@ -895,7 +890,6 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%patch211 -p1 %patch211 -p1
%patch212 -p1 %patch212 -p1
%patch213 -p1 %patch213 -p1
%patch214 -p1
%if ! 0%{?is_opensuse} %if ! 0%{?is_opensuse}
%patch400 -p1 %patch400 -p1
%endif %endif
@ -1024,6 +1018,7 @@ autoreconf -f -i
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export PYTHON=%{_bindir}/python3 export PYTHON=%{_bindir}/python3
%configure --disable-static \ %configure --disable-static \
--with-runstatedir=%{_rundir} \
%{?arg_qemu} \ %{?arg_qemu} \
%{?arg_openvz} \ %{?arg_openvz} \
%{?arg_lxc} \ %{?arg_lxc} \
@ -1039,6 +1034,7 @@ export PYTHON=%{_bindir}/python3
--without-xenapi \ --without-xenapi \
--without-vz \ --without-vz \
--without-bhyve \ --without-bhyve \
--with-remote-default-mode=legacy \
--with-interface \ --with-interface \
--with-network \ --with-network \
--with-storage-fs \ --with-storage-fs \
@ -1249,7 +1245,7 @@ fi
%if %{with_firewalld} %if %{with_firewalld}
%firewalld_reload %firewalld_reload
%endif %endif
%service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %service_add_post libvirtd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket virtproxyd.service virtproxyd.socket virtproxyd-ro.socket virtproxyd-admin.socket virtproxyd-tcp.socket virtproxyd-tls.socket
%{fillup_only -n libvirtd} %{fillup_only -n libvirtd}
%{fillup_only -n virtlockd} %{fillup_only -n virtlockd}
%{fillup_only -n virtlogd} %{fillup_only -n virtlogd}
@ -1266,7 +1262,7 @@ if test $1 -eq 0 ; then
done done
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi fi
%service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket %service_del_postun libvirtd.service virtlockd.service virtlockd.socket virtlogd.service virtlogd.socket virtlockd-admin.socket virtlogd-admin.socket
%posttrans daemon %posttrans daemon
# All connection drivers should be installed post transaction. # All connection drivers should be installed post transaction.
@ -1287,12 +1283,23 @@ if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" != yes ;
fi fi
fi fi
%if %{with_firewalld_zone} %pre daemon-driver-network
%service_add_pre virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
%post daemon-driver-network %post daemon-driver-network
%firewalld_reload %service_add_post virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
%{fillup_only -n virtnetworkd}
%if %{with_firewalld_zone}
%firewalld_reload
%endif
%preun daemon-driver-network
%service_del_preun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
%postun daemon-driver-network %postun daemon-driver-network
%firewalld_reload %service_del_postun virtnetworkd.service virtnetworkd.socket virtnetworkd-ro.socket virtnetworkd-admin.socket
%if %{with_firewalld_zone}
%firewalld_reload
%endif %endif
%post daemon-config-network %post daemon-config-network
@ -1306,6 +1313,110 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/%{name}/qemu/networks/default.xml ;
chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
fi fi
%pre daemon-driver-nwfilter
%service_add_pre virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
%post daemon-driver-nwfilter
%service_add_post virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
%{fillup_only -n virtnwfilterd}
%preun daemon-driver-nwfilter
%service_del_preun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
%postun daemon-driver-nwfilter
%service_del_postun virtnwfilterd.service virtnwfilterd.socket virtnwfilterd-ro.socket virtnwfilterd-admin.socket
%pre daemon-driver-storage
%service_add_pre virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
%post daemon-driver-storage
%service_add_post virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
%{fillup_only -n virtstoraged}
%preun daemon-driver-storage
%service_del_preun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
%postun daemon-driver-storage
%service_del_postun virtstoraged.service virtstoraged.socket virtstoraged-ro.socket virtstoraged-admin.socket
%pre daemon-driver-interface
%service_add_pre virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
%post daemon-driver-interface
%service_add_post virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
%{fillup_only -n virtinterfaced}
%preun daemon-driver-interface
%service_del_preun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
%postun daemon-driver-interface
%service_del_postun virtinterfaced.service virtinterfaced.socket virtinterfaced-ro.socket virtinterfaced-admin.socket
%pre daemon-driver-nodedev
%service_add_pre virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
%post daemon-driver-nodedev
%service_add_post virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
%{fillup_only -n virtnodedevd}
%preun daemon-driver-nodedev
%service_del_preun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
%postun daemon-driver-nodedev
%service_del_postun virtnodedevd.service virtnodedevd.socket virtnodedevd-ro.socket virtnodedevd-admin.socket
%pre daemon-driver-secret
%service_add_pre virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
%post daemon-driver-secret
%service_add_post virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
%{fillup_only -n virtsecretd}
%preun daemon-driver-secret
%service_del_preun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
%postun daemon-driver-secret
%service_del_postun virtsecretd.service virtsecretd.socket virtsecretd-ro.socket virtsecretd-admin.socket
%pre daemon-driver-qemu
%service_add_pre virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
%post daemon-driver-qemu
%service_add_post virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
%{fillup_only -n virtqemud}
%preun daemon-driver-qemu
%service_del_preun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
%postun daemon-driver-qemu
%service_del_postun virtqemud.service virtqemud.socket virtqemud-ro.socket virtqemud-admin.socket
%pre daemon-driver-lxc
%service_add_pre virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
%post daemon-driver-lxc
%service_add_post virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
%{fillup_only -n virtlxcd}
%preun daemon-driver-lxc
%service_del_preun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
%postun daemon-driver-lxc
%service_del_postun virtlxcd.service virtlxcd.socket virtlxcd-ro.socket virtlxcd-admin.socket
%pre daemon-driver-libxl
%service_add_pre virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
%post daemon-driver-libxl
%service_add_post virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
%{fillup_only -n virtxend}
%preun daemon-driver-libxl
%service_del_preun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
%postun daemon-driver-libxl
%service_del_postun virtxend.service virtxend.socket virtxend-ro.socket virtxend-admin.socket
%pre client %pre client
%service_add_pre libvirt-guests.service %service_add_pre libvirt-guests.service
@ -1335,6 +1446,7 @@ fi
%files daemon %files daemon
%{_sbindir}/libvirtd %{_sbindir}/libvirtd
%{_sbindir}/virtproxyd
%{_sbindir}/virtlogd %{_sbindir}/virtlogd
%{_sbindir}/virtlockd %{_sbindir}/virtlockd
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
@ -1349,6 +1461,12 @@ fi
%{_unitdir}/libvirtd-admin.socket %{_unitdir}/libvirtd-admin.socket
%{_unitdir}/libvirtd-tcp.socket %{_unitdir}/libvirtd-tcp.socket
%{_unitdir}/libvirtd-tls.socket %{_unitdir}/libvirtd-tls.socket
%{_unitdir}/virtproxyd.service
%{_unitdir}/virtproxyd.socket
%{_unitdir}/virtproxyd-ro.socket
%{_unitdir}/virtproxyd-admin.socket
%{_unitdir}/virtproxyd-tcp.socket
%{_unitdir}/virtproxyd-tls.socket
%{_unitdir}/virt-guest-shutdown.target %{_unitdir}/virt-guest-shutdown.target
%{_unitdir}/virtlogd.service %{_unitdir}/virtlogd.service
%{_unitdir}/virtlogd.socket %{_unitdir}/virtlogd.socket
@ -1360,6 +1478,7 @@ fi
%{_sbindir}/rcvirtlogd %{_sbindir}/rcvirtlogd
%{_sbindir}/rcvirtlockd %{_sbindir}/rcvirtlockd
%config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf %config(noreplace) %{_sysconfdir}/%{name}/libvirtd.conf
%config(noreplace) %{_sysconfdir}/%{name}/virtproxyd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
%config(noreplace) %{_sysconfdir}/%{name}/virtlogd.conf %config(noreplace) %{_sysconfdir}/%{name}/virtlogd.conf
%config(noreplace) %{_sysconfdir}/%{name}/virtlockd.conf %config(noreplace) %{_sysconfdir}/%{name}/virtlockd.conf
@ -1374,6 +1493,8 @@ fi
%{_datadir}/augeas/lenses/tests/test_virtlogd.aug %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
%{_datadir}/augeas/lenses/virtlockd.aug %{_datadir}/augeas/lenses/virtlockd.aug
%{_datadir}/augeas/lenses/tests/test_virtlockd.aug %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
%{_datadir}/augeas/lenses/virtproxyd.aug
%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
%{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug
%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
%{_datadir}/systemtap/tapset/libvirt_probes*.stp %{_datadir}/systemtap/tapset/libvirt_probes*.stp
@ -1436,10 +1557,26 @@ fi
%config %{_sysconfdir}/%{name}/nwfilter/*.xml %config %{_sysconfdir}/%{name}/nwfilter/*.xml
%files daemon-driver-interface %files daemon-driver-interface
%config(noreplace) %{_sysconfdir}/%{name}/virtinterfaced.conf
%{_datadir}/augeas/lenses/virtinterfaced.aug
%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
%{_unitdir}/virtinterfaced.service
%{_unitdir}/virtinterfaced.socket
%{_unitdir}/virtinterfaced-ro.socket
%{_unitdir}/virtinterfaced-admin.socket
%{_sbindir}/virtinterfaced
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
%files daemon-driver-network %files daemon-driver-network
%config(noreplace) %{_sysconfdir}/%{name}/virtnetworkd.conf
%{_datadir}/augeas/lenses/virtnetworkd.aug
%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
%{_unitdir}/virtnetworkd.service
%{_unitdir}/virtnetworkd.socket
%{_unitdir}/virtnetworkd-ro.socket
%{_unitdir}/virtnetworkd-admin.socket
%{_sbindir}/virtnetworkd
%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/
%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/
%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/qemu/networks/autostart
@ -1453,21 +1590,53 @@ fi
%endif %endif
%files daemon-driver-nodedev %files daemon-driver-nodedev
%config(noreplace) %{_sysconfdir}/%{name}/virtnodedevd.conf
%{_datadir}/augeas/lenses/virtnodedevd.aug
%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
%{_unitdir}/virtnodedevd.service
%{_unitdir}/virtnodedevd.socket
%{_unitdir}/virtnodedevd-ro.socket
%{_unitdir}/virtnodedevd-admin.socket
%{_sbindir}/virtnodedevd
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
%files daemon-driver-nwfilter %files daemon-driver-nwfilter
%config(noreplace) %{_sysconfdir}/%{name}/virtnwfilterd.conf
%{_datadir}/augeas/lenses/virtnwfilterd.aug
%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
%{_unitdir}/virtnwfilterd.service
%{_unitdir}/virtnwfilterd.socket
%{_unitdir}/virtnwfilterd-ro.socket
%{_unitdir}/virtnwfilterd-admin.socket
%{_sbindir}/virtnwfilterd
%dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/ %dir %attr(0700, root, root) %{_sysconfdir}/%{name}/nwfilter/
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
%files daemon-driver-secret %files daemon-driver-secret
%config(noreplace) %{_sysconfdir}/%{name}/virtsecretd.conf
%{_datadir}/augeas/lenses/virtsecretd.aug
%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
%{_unitdir}/virtsecretd.service
%{_unitdir}/virtsecretd.socket
%{_unitdir}/virtsecretd-ro.socket
%{_unitdir}/virtsecretd-admin.socket
%{_sbindir}/virtsecretd
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
%files daemon-driver-storage %files daemon-driver-storage
%files daemon-driver-storage-core %files daemon-driver-storage-core
%config(noreplace) %{_sysconfdir}/%{name}/virtstoraged.conf
%{_datadir}/augeas/lenses/virtstoraged.aug
%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
%{_unitdir}/virtstoraged.service
%{_unitdir}/virtstoraged.socket
%{_unitdir}/virtstoraged-ro.socket
%{_unitdir}/virtstoraged-admin.socket
%{_sbindir}/virtstoraged
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper %attr(0755, root, root) %{_libdir}/%{name}/libvirt_parthelper
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
@ -1515,6 +1684,14 @@ fi
%if %{with_qemu} %if %{with_qemu}
%files daemon-driver-qemu %files daemon-driver-qemu
%config(noreplace) %{_sysconfdir}/%{name}/virtqemud.conf
%{_datadir}/augeas/lenses/virtqemud.aug
%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
%{_unitdir}/virtqemud.service
%{_unitdir}/virtqemud.socket
%{_unitdir}/virtqemud-ro.socket
%{_unitdir}/virtqemud-admin.socket
%{_sbindir}/virtqemud
%config(noreplace) %{_sysconfdir}/%{name}/qemu.conf %config(noreplace) %{_sysconfdir}/%{name}/qemu.conf
%config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/%{name}/qemu-lockd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
@ -1534,6 +1711,14 @@ fi
%if %{with_lxc} %if %{with_lxc}
%files daemon-driver-lxc %files daemon-driver-lxc
%config(noreplace) %{_sysconfdir}/%{name}/virtlxcd.conf
%{_datadir}/augeas/lenses/virtlxcd.aug
%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
%{_unitdir}/virtlxcd.service
%{_unitdir}/virtlxcd.socket
%{_unitdir}/virtlxcd-ro.socket
%{_unitdir}/virtlxcd-admin.socket
%{_sbindir}/virtlxcd
%config(noreplace) %{_sysconfdir}/%{name}/lxc.conf %config(noreplace) %{_sysconfdir}/%{name}/lxc.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
%dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/lxc/
@ -1553,6 +1738,14 @@ fi
%if %{with_libxl} %if %{with_libxl}
%files daemon-driver-libxl %files daemon-driver-libxl
%config(noreplace) %{_sysconfdir}/%{name}/virtxend.conf
%{_datadir}/augeas/lenses/virtxend.aug
%{_datadir}/augeas/lenses/tests/test_virtxend.aug
%{_unitdir}/virtxend.service
%{_unitdir}/virtxend.socket
%{_unitdir}/virtxend-ro.socket
%{_unitdir}/virtxend-admin.socket
%{_sbindir}/virtxend
%config(noreplace) %{_sysconfdir}/%{name}/libxl.conf %config(noreplace) %{_sysconfdir}/%{name}/libxl.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
%config(noreplace) %{_sysconfdir}/%{name}/libxl-lockd.conf %config(noreplace) %{_sysconfdir}/%{name}/libxl-lockd.conf
@ -1567,6 +1760,14 @@ fi
%if %{with_vbox} %if %{with_vbox}
%files daemon-driver-vbox %files daemon-driver-vbox
%config(noreplace) %{_sysconfdir}/%{name}/virtvboxd.conf
%{_datadir}/augeas/lenses/virtvboxd.aug
%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
%{_unitdir}/virtvboxd.service
%{_unitdir}/virtvboxd.socket
%{_unitdir}/virtvboxd-ro.socket
%{_unitdir}/virtvboxd-admin.socket
%{_sbindir}/virtvboxd
%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
%endif %endif

View File

@ -8,10 +8,10 @@ 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-5.6.0/src/libxl/libxl_driver.c Index: libvirt-5.7.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c --- libvirt-5.7.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c +++ libvirt-5.7.0/src/libxl/libxl_driver.c
@@ -1364,6 +1364,61 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1364,6 +1364,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }
@ -74,7 +74,7 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom, libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
@@ -6539,6 +6594,7 @@ static virHypervisorDriver libxlHypervis @@ -6613,6 +6668,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 */

View File

@ -3,10 +3,10 @@ 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-5.6.0/src/libxl/libxl_conf.c Index: libvirt-5.7.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c --- libvirt-5.7.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c +++ libvirt-5.7.0/src/libxl/libxl_conf.c
@@ -897,6 +897,30 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -897,6 +897,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }

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-5.6.0/include/libvirt/libvirt-domain.h Index: libvirt-5.7.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/include/libvirt/libvirt-domain.h --- libvirt-5.7.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-5.6.0/include/libvirt/libvirt-domain.h +++ libvirt-5.7.0/include/libvirt/libvirt-domain.h
@@ -1051,6 +1051,31 @@ typedef enum { @@ -1051,6 +1051,31 @@ typedef enum {
*/ */
# define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections" # define VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS "parallel.connections"
@ -52,11 +52,11 @@ Index: libvirt-5.6.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-5.6.0/src/libxl/libxl_driver.c Index: libvirt-5.7.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_driver.c --- libvirt-5.7.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.6.0/src/libxl/libxl_driver.c +++ libvirt-5.7.0/src/libxl/libxl_driver.c
@@ -6146,6 +6146,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -6156,6 +6156,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-5.6.0/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError(); virReportUnsupportedError();
@@ -6162,6 +6165,18 @@ libxlDomainMigratePerform3Params(virDoma @@ -6172,6 +6175,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-5.6.0/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI, VIR_MIGRATE_PARAM_URI,
&uri) < 0) &uri) < 0)
@@ -6176,11 +6191,11 @@ libxlDomainMigratePerform3Params(virDoma @@ -6186,11 +6201,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,10 +99,10 @@ Index: libvirt-5.6.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-5.6.0/src/libxl/libxl_migration.c Index: libvirt-5.7.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_migration.c --- libvirt-5.7.0.orig/src/libxl/libxl_migration.c
+++ libvirt-5.6.0/src/libxl/libxl_migration.c +++ libvirt-5.7.0/src/libxl/libxl_migration.c
@@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s @@ -342,18 +342,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
static int static int
libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -264,10 +264,10 @@ Index: libvirt-5.6.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret < 0) { if (ret < 0) {
Index: libvirt-5.6.0/src/libxl/libxl_migration.h Index: libvirt-5.7.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_migration.h --- libvirt-5.7.0.orig/src/libxl/libxl_migration.h
+++ libvirt-5.6.0/src/libxl/libxl_migration.h +++ libvirt-5.7.0/src/libxl/libxl_migration.h
@@ -35,6 +35,10 @@ @@ -35,6 +35,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, \
@ -312,13 +312,13 @@ Index: libvirt-5.6.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-5.6.0/tools/virsh-domain.c Index: libvirt-5.7.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/virsh-domain.c --- libvirt-5.7.0.orig/tools/virsh-domain.c
+++ libvirt-5.6.0/tools/virsh-domain.c +++ libvirt-5.7.0/tools/virsh-domain.c
@@ -10587,6 +10587,22 @@ static const vshCmdOptDef opts_migrate[] @@ -10591,6 +10591,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_INT, .type = VSH_OT_INT,
.help = N_("number of connections for parallel migration") .help = N_("migration bandwidth limit in MiB/s")
}, },
+ {.name = "max_iters", + {.name = "max_iters",
+ .type = VSH_OT_INT, + .type = VSH_OT_INT,
@ -339,7 +339,7 @@ Index: libvirt-5.6.0/tools/virsh-domain.c
{.name = NULL} {.name = NULL}
}; };
@@ -10610,6 +10626,7 @@ doMigrate(void *opaque) @@ -10614,6 +10630,7 @@ doMigrate(void *opaque)
unsigned long long ullOpt = 0; unsigned long long ullOpt = 0;
int rv; int rv;
virConnectPtr dconn = data->dconn; virConnectPtr dconn = data->dconn;
@ -347,7 +347,7 @@ Index: libvirt-5.6.0/tools/virsh-domain.c
sigemptyset(&sigmask); sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT); sigaddset(&sigmask, SIGINT);
@@ -10729,6 +10746,27 @@ doMigrate(void *opaque) @@ -10733,6 +10750,27 @@ doMigrate(void *opaque)
goto save_error; goto save_error;
} }
@ -375,11 +375,11 @@ Index: libvirt-5.6.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-5.6.0/tools/virsh.pod Index: libvirt-5.7.0/tools/virsh.pod
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/virsh.pod --- libvirt-5.7.0.orig/tools/virsh.pod
+++ libvirt-5.6.0/tools/virsh.pod +++ libvirt-5.7.0/tools/virsh.pod
@@ -2026,6 +2026,14 @@ I<--parallel-connections>. Parallel conn @@ -2254,6 +2254,14 @@ I<--parallel-connections>. Parallel conn
network link between the source and the target and thus speeding up the network link between the source and the target and thus speeding up the
migration. migration.

View File

@ -7,10 +7,10 @@ and npiv.
For more details, see bsc#954872 and FATE#319810 For more details, see bsc#954872 and FATE#319810
Index: libvirt-5.6.0/src/libxl/libxl_conf.c Index: libvirt-5.7.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c --- libvirt-5.7.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c +++ libvirt-5.7.0/src/libxl/libxl_conf.c
@@ -897,6 +897,25 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -897,6 +897,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }

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-5.6.0/src/lxc/lxc_controller.c Index: libvirt-5.7.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/lxc/lxc_controller.c --- libvirt-5.7.0.orig/src/lxc/lxc_controller.c
+++ libvirt-5.6.0/src/lxc/lxc_controller.c +++ libvirt-5.7.0/src/lxc/lxc_controller.c
@@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
#include "rpc/virnetdaemon.h" #include "rpc/virnetdaemon.h"
#include "virstring.h" #include "virstring.h"
@ -33,10 +33,10 @@ Index: libvirt-5.6.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-5.6.0/src/lxc/lxc_driver.c Index: libvirt-5.7.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/lxc/lxc_driver.c --- libvirt-5.7.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.6.0/src/lxc/lxc_driver.c +++ libvirt-5.7.0/src/lxc/lxc_driver.c
@@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@
#include "virtime.h" #include "virtime.h"
#include "virtypedparam.h" #include "virtypedparam.h"
@ -61,10 +61,10 @@ Index: libvirt-5.6.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-5.6.0/src/lxc/lxc_process.c Index: libvirt-5.7.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/lxc/lxc_process.c --- libvirt-5.7.0.orig/src/lxc/lxc_process.c
+++ libvirt-5.6.0/src/lxc/lxc_process.c +++ libvirt-5.7.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"

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-5.6.0/src/network/bridge_driver.c Index: libvirt-5.7.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/network/bridge_driver.c --- libvirt-5.7.0.orig/src/network/bridge_driver.c
+++ libvirt-5.6.0/src/network/bridge_driver.c +++ libvirt-5.7.0/src/network/bridge_driver.c
@@ -1528,7 +1528,14 @@ networkDnsmasqConfContents(virNetworkObj @@ -1510,7 +1510,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-5.6.0/src/network/bridge_driver.c
} }
if (ipdef->tftproot) { if (ipdef->tftproot) {
Index: libvirt-5.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-5.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-5.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-5.6.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-5.7.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

View File

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

View File

@ -1,7 +1,7 @@
Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu Index: libvirt-5.7.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-5.7.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.6.0/src/security/apparmor/libvirt-qemu +++ libvirt-5.7.0/src/security/apparmor/libvirt-qemu
@@ -228,3 +228,6 @@ @@ -228,3 +228,6 @@
# required for sasl GSSAPI plugin # required for sasl GSSAPI plugin
/etc/gss/mech.d/ r, /etc/gss/mech.d/ r,

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-5.6.0/src/xenconfig/xen_common.c Index: libvirt-5.7.0/src/libxl/xen_common.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/xenconfig/xen_common.c --- libvirt-5.7.0.orig/src/libxl/xen_common.c
+++ libvirt-5.6.0/src/xenconfig/xen_common.c +++ libvirt-5.7.0/src/libxl/xen_common.c
@@ -388,12 +388,19 @@ xenParsePCI(char *entry) @@ -388,12 +388,19 @@ xenParsePCI(char *entry)
int busID; int busID;
int slotID; int slotID;

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-5.6.0/src/security/apparmor/libvirt-qemu Index: libvirt-5.7.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-5.7.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.6.0/src/security/apparmor/libvirt-qemu +++ libvirt-5.7.0/src/security/apparmor/libvirt-qemu
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
#/dev/fb* rw, #/dev/fb* rw,
@ -20,13 +20,13 @@ Index: libvirt-5.6.0/src/security/apparmor/libvirt-qemu
@{HOME}/.pulse-cookie rwk, @{HOME}/.pulse-cookie rwk,
owner /root/.pulse-cookie rwk, owner /root/.pulse-cookie rwk,
owner /root/.pulse/ rw, owner /root/.pulse/ rw,
Index: libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-5.7.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-5.7.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-5.6.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ libvirt-5.7.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -17,7 +17,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ @@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
owner @{PROC}/[0-9]*/status r, # Used when internally running another command (namely apparmor_parser)
@{PROC}/filesystems r, @{PROC}/@{pid}/fd/ r,
- /etc/libnl-3/classid r, - /etc/libnl-3/classid r,
+ /etc/libnl*/classid r, + /etc/libnl*/classid r,

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-5.6.0/tools/libvirt-guests.sh.in Index: libvirt-5.7.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/libvirt-guests.sh.in --- libvirt-5.7.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-5.6.0/tools/libvirt-guests.sh.in +++ libvirt-5.7.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/>.
@ -163,10 +163,10 @@ Index: libvirt-5.6.0/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-5.6.0/tools/libvirt-guests.sysconf Index: libvirt-5.7.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/libvirt-guests.sysconf --- libvirt-5.7.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-5.6.0/tools/libvirt-guests.sysconf +++ libvirt-5.7.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

View File

@ -3,11 +3,24 @@ 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-5.6.0/src/remote/libvirtd.conf Index: libvirt-5.7.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/remote/libvirtd.conf --- libvirt-5.7.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-5.6.0/src/remote/libvirtd.conf +++ libvirt-5.7.0/src/remote/remote_daemon_config.c
@@ -16,8 +16,8 @@ @@ -109,7 +109,7 @@ daemonConfigNew(bool privileged ATTRIBUT
#ifdef WITH_IP
# ifdef LIBVIRTD
- data->listen_tls = 1; /* Only honoured if --listen is set */
+ data->listen_tls = 0; /* Only honoured if --listen is set */
# else /* ! LIBVIRTD */
data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */
# endif /* ! LIBVIRTD */
Index: libvirt-5.7.0/src/remote/libvirtd.conf.in
===================================================================
--- libvirt-5.7.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-5.7.0/src/remote/libvirtd.conf.in
@@ -17,8 +17,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.
# #
@ -17,30 +30,4 @@ Index: libvirt-5.6.0/src/remote/libvirtd.conf
+#listen_tls = 1 +#listen_tls = 1
# 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 @DAEMON_NAME@ process for this to
Index: libvirt-5.6.0/src/remote/remote_daemon_config.c
===================================================================
--- libvirt-5.6.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-5.6.0/src/remote/remote_daemon_config.c
@@ -106,7 +106,7 @@ daemonConfigNew(bool privileged ATTRIBUT
if (VIR_ALLOC(data) < 0)
return NULL;
- data->listen_tls = 1;
+ data->listen_tls = 0;
data->listen_tcp = 0;
if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
Index: libvirt-5.6.0/src/remote/test_libvirtd.aug.in
===================================================================
--- libvirt-5.6.0.orig/src/remote/test_libvirtd.aug.in
+++ libvirt-5.6.0/src/remote/test_libvirtd.aug.in
@@ -2,7 +2,7 @@ module Test_libvirtd =
::CONFIG::
test Libvirtd.lns get conf =
- { "listen_tls" = "0" }
+ { "listen_tls" = "1" }
{ "listen_tcp" = "1" }
{ "tls_port" = "16514" }
{ "tcp_port" = "16509" }

View File

@ -1,22 +0,0 @@
Add support for Xen in libvirtd service file
libvirtd should be started after the xencommons service.
libvirtd should also conflict with the xendomains service.
On SUSE distros, we promote libvirt and all the libvirt-based
tools. If a user installs libvirt on their SUSE Xen host, then
libvirt should be king and override xendomains. See bsc#1015348
Index: libvirt-5.6.0/src/remote/libvirtd.service.in
===================================================================
--- libvirt-5.6.0.orig/src/remote/libvirtd.service.in
+++ libvirt-5.6.0/src/remote/libvirtd.service.in
@@ -15,6 +15,8 @@ After=local-fs.target
After=remote-fs.target
After=systemd-logind.service
After=systemd-machined.service
+After=xencommons.service
+Conflicts=xendomains.service
Documentation=man:libvirtd(8)
Documentation=https://libvirt.org

View File

@ -1,19 +1,21 @@
Adjust libvirtd sysconfig file to conform to SUSE standards Adjust libvirtd sysconfig file to conform to SUSE standards
Index: libvirt-5.6.0/src/remote/libvirtd.sysconf Index: libvirt-5.7.0/src/remote/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/remote/libvirtd.sysconf --- libvirt-5.7.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-5.6.0/src/remote/libvirtd.sysconf +++ libvirt-5.7.0/src/remote/libvirtd.sysconf
@@ -1,13 +1,18 @@ @@ -1,5 +1,9 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
# Customizations for the libvirtd.service systemd unit # Customizations for the libvirtd.service systemd unit
-# Listen for TCP/IP connections. This is not required if using systemd
-# socket activation.
-# NB. must setup TLS/SSL keys prior to using this
+## Type: string +## Type: string
+## Default: --listen +## Default: "--timeout 120"
+# Arguments to pass to libvirtd. Not required if using systemd socket activation. +# Arguments to pass to libvirtd. Not required if using systemd socket activation.
# Default behaviour is for libvirtd.service to start on boot
# so that VM autostart can be performed. We then want it to
# shutdown again if nothing was started and rely on systemd
@@ -11,9 +15,13 @@ LIBVIRTD_ARGS="--timeout 120"
# can be used to listen on TCP/TLS sockets
#LIBVIRTD_ARGS="--listen" #LIBVIRTD_ARGS="--listen"
+## Type: string +## Type: string

View File

@ -6,10 +6,10 @@ autoballooning. This patch changes libvirt to also disable autoballooning
by default. It can only be enabled with the 'autoballoon' setting in by default. It can only be enabled with the 'autoballoon' setting in
libxl.conf. See jsc#SLE-3059 for more details. libxl.conf. See jsc#SLE-3059 for more details.
Index: libvirt-5.6.0/src/libxl/libxl.conf Index: libvirt-5.7.0/src/libxl/libxl.conf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl.conf --- libvirt-5.7.0.orig/src/libxl/libxl.conf
+++ libvirt-5.6.0/src/libxl/libxl.conf +++ libvirt-5.7.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@ @@ -4,12 +4,11 @@
# Enable autoballooning of domain0 # Enable autoballooning of domain0
@ -27,10 +27,10 @@ Index: libvirt-5.6.0/src/libxl/libxl.conf
# In order to prevent accidentally starting two domains that # In order to prevent accidentally starting two domains that
Index: libvirt-5.6.0/src/libxl/libxl_conf.c Index: libvirt-5.7.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/libxl/libxl_conf.c --- libvirt-5.7.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.6.0/src/libxl/libxl_conf.c +++ libvirt-5.7.0/src/libxl/libxl_conf.c
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <config.h> #include <config.h>

View File

@ -1,9 +1,9 @@
Adjust paths of OVMF firmwares on SUSE distros Adjust paths of OVMF firmwares on SUSE distros
Index: libvirt-5.6.0/src/qemu/qemu.conf Index: libvirt-5.7.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu.conf --- libvirt-5.7.0.orig/src/qemu/qemu.conf
+++ libvirt-5.6.0/src/qemu/qemu.conf +++ libvirt-5.7.0/src/qemu/qemu.conf
@@ -796,10 +796,9 @@ @@ -796,10 +796,9 @@
# 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.
@ -18,10 +18,10 @@ Index: libvirt-5.6.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-5.6.0/src/qemu/qemu_conf.c Index: libvirt-5.7.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu_conf.c --- libvirt-5.7.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.6.0/src/qemu/qemu_conf.c +++ libvirt-5.7.0/src/qemu/qemu_conf.c
@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver @@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
@ -36,11 +36,11 @@ Index: libvirt-5.6.0/src/qemu/qemu_conf.c
#endif #endif
Index: libvirt-5.6.0/src/security/virt-aa-helper.c Index: libvirt-5.7.0/src/security/virt-aa-helper.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/security/virt-aa-helper.c --- libvirt-5.7.0.orig/src/security/virt-aa-helper.c
+++ libvirt-5.6.0/src/security/virt-aa-helper.c +++ libvirt-5.7.0/src/security/virt-aa-helper.c
@@ -506,7 +506,8 @@ valid_path(const char *path, const bool @@ -509,7 +509,8 @@ valid_path(const char *path, const bool
"/usr/share/ovmf/", /* for OVMF images */ "/usr/share/ovmf/", /* for OVMF images */
"/usr/share/AAVMF/", /* for AAVMF images */ "/usr/share/AAVMF/", /* for AAVMF images */
"/usr/share/qemu-efi/", /* for AAVMF images */ "/usr/share/qemu-efi/", /* for AAVMF images */

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-5.6.0/src/qemu/qemu.conf Index: libvirt-5.7.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu.conf --- libvirt-5.7.0.orig/src/qemu/qemu.conf
+++ libvirt-5.6.0/src/qemu/qemu.conf +++ libvirt-5.7.0/src/qemu/qemu.conf
@@ -420,10 +420,19 @@ @@ -420,10 +420,19 @@
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
# #
@ -60,10 +60,10 @@ Index: libvirt-5.6.0/src/qemu/qemu.conf
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-5.6.0/src/qemu/qemu_conf.c Index: libvirt-5.7.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/qemu/qemu_conf.c --- libvirt-5.7.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.6.0/src/qemu/qemu_conf.c +++ libvirt-5.7.0/src/qemu/qemu_conf.c
@@ -287,7 +287,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf @@ -287,7 +287,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
cfg->clearEmulatorCapabilities = true; cfg->clearEmulatorCapabilities = true;

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-5.6.0/src/locking/virtlockd.sysconf Index: libvirt-5.7.0/src/locking/virtlockd.sysconf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/locking/virtlockd.sysconf --- libvirt-5.7.0.orig/src/locking/virtlockd.sysconf
+++ libvirt-5.6.0/src/locking/virtlockd.sysconf +++ libvirt-5.7.0/src/locking/virtlockd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlockd +## Path: System/Virtualization/virtlockd
+ +

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-5.6.0/src/logging/virtlogd.sysconf Index: libvirt-5.7.0/src/logging/virtlogd.sysconf
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/src/logging/virtlogd.sysconf --- libvirt-5.7.0.orig/src/logging/virtlogd.sysconf
+++ libvirt-5.6.0/src/logging/virtlogd.sysconf +++ libvirt-5.7.0/src/logging/virtlogd.sysconf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+## Path: System/Virtualization/virtlogd +## Path: System/Virtualization/virtlogd
+ +

View File

@ -1,8 +1,8 @@
Index: libvirt-5.6.0/tools/Makefile.am Index: libvirt-5.7.0/tools/Makefile.am
=================================================================== ===================================================================
--- libvirt-5.6.0.orig/tools/Makefile.am --- libvirt-5.7.0.orig/tools/Makefile.am
+++ libvirt-5.6.0/tools/Makefile.am +++ libvirt-5.7.0/tools/Makefile.am
@@ -52,6 +52,7 @@ PODFILES = \ @@ -59,6 +59,7 @@ PODFILES = \
virt-sanlock-cleanup.pod \ virt-sanlock-cleanup.pod \
virt-xml-validate.pod \ virt-xml-validate.pod \
virsh.pod \ virsh.pod \
@ -10,7 +10,7 @@ Index: libvirt-5.6.0/tools/Makefile.am
$(NULL) $(NULL)
MANINFILES = \ MANINFILES = \
@@ -87,7 +88,7 @@ MAINTAINERCLEANFILES = @@ -94,7 +95,7 @@ MAINTAINERCLEANFILES =
confdir = $(sysconfdir)/libvirt confdir = $(sysconfdir)/libvirt
conf_DATA = conf_DATA =
@ -19,7 +19,7 @@ Index: libvirt-5.6.0/tools/Makefile.am
bin_PROGRAMS = virsh virt-admin bin_PROGRAMS = virsh virt-admin
libexec_SCRIPTS = libvirt-guests.sh libexec_SCRIPTS = libvirt-guests.sh
man1_MANS = \ man1_MANS = \
@@ -113,6 +114,8 @@ bin_PROGRAMS += virt-host-validate @@ -121,6 +122,8 @@ bin_PROGRAMS += virt-host-validate
man1_MANS += virt-host-validate.1 man1_MANS += virt-host-validate.1
endif WITH_HOST_VALIDATE endif WITH_HOST_VALIDATE
@ -28,10 +28,10 @@ Index: libvirt-5.6.0/tools/Makefile.am
virt-xml-validate: virt-xml-validate.in Makefile virt-xml-validate: virt-xml-validate.in Makefile
$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \ $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \ -e 's|[@]VERSION@|$(VERSION)|g' \
Index: libvirt-5.6.0/tools/virt-create-rootfs Index: libvirt-5.7.0/tools/virt-create-rootfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.6.0/tools/virt-create-rootfs +++ libvirt-5.7.0/tools/virt-create-rootfs
@@ -0,0 +1,214 @@ @@ -0,0 +1,214 @@
+#!/bin/sh +#!/bin/sh
+set -e +set -e
@ -247,10 +247,10 @@ Index: libvirt-5.6.0/tools/virt-create-rootfs
+ echo "pts/0" >> "$ROOT/etc/securetty" + echo "pts/0" >> "$ROOT/etc/securetty"
+ chroot "$ROOT" /usr/bin/passwd + chroot "$ROOT" /usr/bin/passwd
+fi +fi
Index: libvirt-5.6.0/tools/virt-create-rootfs.pod Index: libvirt-5.7.0/tools/virt-create-rootfs.pod
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.6.0/tools/virt-create-rootfs.pod +++ libvirt-5.7.0/tools/virt-create-rootfs.pod
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
+=head1 NAME +=head1 NAME
+ +