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

Accepting request 753763 from Virtualization

Browse Source 
Supersedes req#753076

- Update to libvirt 5.10.0
  - bsc#1157149
  - Many incremental improvements and bug fixes, see
    https://libvirt.org/news.html
  - Dropped patches:
    2552752f-libxl-fix-lock-manager-lock-ordering.patch
  - Added patches:
    0a65cba4-news-fix.patch

- spec: Enable 'libvirt' firewalld zone for firewalld >= 0.7.0
  boo#1157766

OBS-URL: https://build.opensuse.org/request/show/753763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=293
This commit is contained in:
Dominique Leuenberger 2019-12-07 14:16:19 +00:00 committed by Git OBS Bridge
commit caa1e936aa
32 changed files with 311 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
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-5.9.0/src/conf/domain_stats.c Index: libvirt-5.10.0/src/conf/domain_stats.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.9.0/src/conf/domain_stats.c +++ libvirt-5.10.0/src/conf/domain_stats.c
@@ -0,0 +1,119 @@ @@ -0,0 +1,119 @@
+/* +/*
+ * domain_stats.c: domain stats extraction helpers + * domain_stats.c: domain stats extraction helpers
@ -142,10 +142,10 @@ Index: libvirt-5.9.0/src/conf/domain_stats.c
+} +}
+ +
+#undef STATS_ADD_NET_PARAM +#undef STATS_ADD_NET_PARAM
Index: libvirt-5.9.0/src/conf/domain_stats.h Index: libvirt-5.10.0/src/conf/domain_stats.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.9.0/src/conf/domain_stats.h +++ libvirt-5.10.0/src/conf/domain_stats.h
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+/* +/*
+ * domain_stats.h: domain stats extraction helpers + * domain_stats.h: domain stats extraction helpers
@ -209,10 +209,10 @@ Index: libvirt-5.9.0/src/conf/domain_stats.h
+ virTypedParamListPtr params); + virTypedParamListPtr params);
+ +
+#endif /* __DOMAIN_STATS_H */ +#endif /* __DOMAIN_STATS_H */
Index: libvirt-5.9.0/src/libvirt_private.syms Index: libvirt-5.10.0/src/libvirt_private.syms
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libvirt_private.syms --- libvirt-5.10.0.orig/src/libvirt_private.syms
+++ libvirt-5.9.0/src/libvirt_private.syms +++ libvirt-5.10.0/src/libvirt_private.syms
@@ -697,6 +697,9 @@ virDomainConfNWFilterInstantiate; @@ -697,6 +697,9 @@ virDomainConfNWFilterInstantiate;
virDomainConfNWFilterTeardown; virDomainConfNWFilterTeardown;
virDomainConfVMNWFilterTeardown; virDomainConfVMNWFilterTeardown;
@ -223,7 +223,7 @@ Index: libvirt-5.9.0/src/libvirt_private.syms
# conf/interface_conf.h # conf/interface_conf.h
virInterfaceDefFormat; virInterfaceDefFormat;
@@ -1653,6 +1656,7 @@ virCgroupGetMemoryUsage; @@ -1669,6 +1672,7 @@ virCgroupGetMemoryUsage;
virCgroupGetMemSwapHardLimit; virCgroupGetMemSwapHardLimit;
virCgroupGetMemSwapUsage; virCgroupGetMemSwapUsage;
virCgroupGetPercpuStats; virCgroupGetPercpuStats;
@ -231,11 +231,11 @@ Index: libvirt-5.9.0/src/libvirt_private.syms
virCgroupHasController; virCgroupHasController;
virCgroupHasEmptyTasks; virCgroupHasEmptyTasks;
virCgroupKillPainfully; virCgroupKillPainfully;
Index: libvirt-5.9.0/src/qemu/qemu_driver.c Index: libvirt-5.10.0/src/qemu/qemu_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/qemu/qemu_driver.c --- libvirt-5.10.0.orig/src/qemu/qemu_driver.c
+++ libvirt-5.9.0/src/qemu/qemu_driver.c +++ libvirt-5.10.0/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@ @@ -66,6 +66,7 @@
#include "virarptable.h" #include "virarptable.h"
#include "viruuid.h" #include "viruuid.h"
#include "domain_conf.h" #include "domain_conf.h"
@ -243,7 +243,7 @@ Index: libvirt-5.9.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"
@@ -20394,13 +20395,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr @@ -20389,13 +20390,7 @@ qemuDomainGetStatsState(virQEMUDriverPtr
virTypedParamListPtr params, virTypedParamListPtr params,
unsigned int privflags G_GNUC_UNUSED) unsigned int privflags G_GNUC_UNUSED)
{ {
@ -258,7 +258,7 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
} }
@@ -20601,17 +20596,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj @@ -20596,17 +20591,7 @@ qemuDomainGetStatsCpuCgroup(virDomainObj
if (!priv->cgroup) if (!priv->cgroup)
return 0; return 0;
@ -277,7 +277,7 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
} }
@@ -20768,79 +20753,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr @@ -20763,76 +20748,15 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr
return ret; return ret;
} }
@ -294,13 +294,12 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
{ {
- size_t i; - size_t i;
- struct _virDomainInterfaceStats tmp; - struct _virDomainInterfaceStats tmp;
- int ret = -1;
- -
- if (!virDomainObjIsActive(dom)) - if (!virDomainObjIsActive(dom))
- return 0; - return 0;
- -
- if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0) - if (virTypedParamListAddUInt(params, dom->def->nnets, "net.count") < 0)
- goto cleanup; - return -1;
- -
- /* Check the path is one of the domain's network interfaces. */ - /* Check the path is one of the domain's network interfaces. */
- for (i = 0; i < dom->def->nnets; i++) { - for (i = 0; i < dom->def->nnets; i++) {
@ -315,7 +314,7 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
- actualType = virDomainNetGetActualType(net); - actualType = virDomainNetGetActualType(net);
- -
- if (virTypedParamListAddString(params, net->ifname, "net.%zu.name", i) < 0) - if (virTypedParamListAddString(params, net->ifname, "net.%zu.name", i) < 0)
- goto cleanup; - return -1;
- -
- if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) { - if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
- if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) { - if (virNetDevOpenvswitchInterfaceStats(net->ifname, &tmp) < 0) {
@ -348,9 +347,7 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
- "tx.drop", tmp.tx_drop); - "tx.drop", tmp.tx_drop);
- } - }
- -
- ret = 0; - return 0;
- cleanup:
- return ret;
+ return virDomainStatsGetInterface(dom,params); + return virDomainStatsGetInterface(dom,params);
} }
@ -358,11 +355,11 @@ Index: libvirt-5.9.0/src/qemu/qemu_driver.c
/* refresh information by opening images on the disk */ /* refresh information by opening images on the disk */
static int static int
Index: libvirt-5.9.0/src/util/vircgroup.c Index: libvirt-5.10.0/src/util/vircgroup.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/util/vircgroup.c --- libvirt-5.10.0.orig/src/util/vircgroup.c
+++ libvirt-5.9.0/src/util/vircgroup.c +++ libvirt-5.10.0/src/util/vircgroup.c
@@ -2785,6 +2785,31 @@ virCgroupControllerAvailable(int control @@ -2773,6 +2773,31 @@ virCgroupControllerAvailable(int control
return ret; return ret;
} }
@ -394,7 +391,7 @@ Index: libvirt-5.9.0/src/util/vircgroup.c
#else /* !__linux__ */ #else /* !__linux__ */
bool bool
@@ -2794,6 +2819,14 @@ virCgroupAvailable(void) @@ -2782,6 +2807,14 @@ virCgroupAvailable(void)
} }
@ -409,10 +406,10 @@ Index: libvirt-5.9.0/src/util/vircgroup.c
int int
virCgroupNewPartition(const char *path G_GNUC_UNUSED, virCgroupNewPartition(const char *path G_GNUC_UNUSED,
bool create G_GNUC_UNUSED, bool create G_GNUC_UNUSED,
Index: libvirt-5.9.0/src/util/vircgroup.h Index: libvirt-5.10.0/src/util/vircgroup.h
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/util/vircgroup.h --- libvirt-5.10.0.orig/src/util/vircgroup.h
+++ libvirt-5.9.0/src/util/vircgroup.h +++ libvirt-5.10.0/src/util/vircgroup.h
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include "virutil.h" #include "virutil.h"
#include "virbitmap.h" #include "virbitmap.h"
@ -428,10 +425,10 @@ Index: libvirt-5.9.0/src/util/vircgroup.h
+ +
+int virCgroupGetStatsCpu(virCgroupPtr cgroup, +int virCgroupGetStatsCpu(virCgroupPtr cgroup,
+ virTypedParamListPtr params); + virTypedParamListPtr params);
Index: libvirt-5.9.0/src/conf/Makefile.inc.am Index: libvirt-5.10.0/src/conf/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/conf/Makefile.inc.am --- libvirt-5.10.0.orig/src/conf/Makefile.inc.am
+++ libvirt-5.9.0/src/conf/Makefile.inc.am +++ libvirt-5.10.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 \

13
0001-libxl-add-support-for-BlockResize-API.patch
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.9.0/src/libxl/libxl_driver.c Index: libvirt-5.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c --- libvirt-5.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c +++ libvirt-5.10.0/src/libxl/libxl_driver.c
@@ -5283,6 +5283,97 @@ libxlDomainMemoryStats(virDomainPtr dom, @@ -5281,6 +5281,96 @@ libxlDomainMemoryStats(virDomainPtr dom,
#undef LIBXL_SET_MEMSTAT #undef LIBXL_SET_MEMSTAT
@ -95,8 +95,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_driver.c
+ disk->src->format == VIR_STORAGE_FILE_QED) + disk->src->format == VIR_STORAGE_FILE_QED)
+ size = VIR_ROUND_UP(size, 512); + size = VIR_ROUND_UP(size, 512);
+ +
+ if (virAsprintf(&moncmd, "block_resize %s %lluB", disk->dst, size) < 0) + moncmd = g_strdup_printf("block_resize %s %lluB", disk->dst, size);
+ goto endjob;
+ +
+ if (libxl_qemu_monitor_command(cfg->ctx, vm->def->id, moncmd, &monreply) != 0) { + if (libxl_qemu_monitor_command(cfg->ctx, vm->def->id, moncmd, &monreply) != 0) {
+ virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_OPERATION_FAILED,
@ -121,7 +120,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_driver.c
static int static int
libxlDomainGetJobInfo(virDomainPtr dom, libxlDomainGetJobInfo(virDomainPtr dom,
virDomainJobInfoPtr info) virDomainJobInfoPtr info)
@@ -6724,6 +6815,7 @@ static virHypervisorDriver libxlHypervis @@ -6718,6 +6808,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 */

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-5.9.0/src/lxc/lxc_driver.c Index: libvirt-5.10.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/lxc/lxc_driver.c --- libvirt-5.10.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.9.0/src/lxc/lxc_driver.c +++ libvirt-5.10.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"
@ -21,7 +21,7 @@ Index: libvirt-5.9.0/src/lxc/lxc_driver.c
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -5394,6 +5395,135 @@ lxcDomainHasManagedSaveImage(virDomainPt @@ -5382,6 +5383,135 @@ lxcDomainHasManagedSaveImage(virDomainPt
return ret; return ret;
} }
@ -157,7 +157,7 @@ Index: libvirt-5.9.0/src/lxc/lxc_driver.c
/* Function Tables */ /* Function Tables */
static virHypervisorDriver lxcHypervisorDriver = { static virHypervisorDriver lxcHypervisorDriver = {
@@ -5489,6 +5619,7 @@ static virHypervisorDriver lxcHypervisor @@ -5477,6 +5607,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 */

30
0a65cba4-news-fix.patch Normal file
View File

@ -0,0 +1,30 @@
commit 0a65cba423781f2cbf123354b7f670c4f441b385
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon Dec 2 20:48:24 2019 -0700
news: Fix XML validation
The news schema requires two digits for both month and day in the date
attribute. s/2/02/ in the day value of date to fix the following
'make check' failure
2165) Checking ../docs/news.xml against ../news.rng ...
libvirt: XML Util error : XML document failed to validate against schema:
Unable to validate doc against /home/jfehlig/virt/upstream/libvirt/build/../docs/schemas/../news.rng
Element release failed to validate attributes
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Index: libvirt-5.10.0/docs/news.xml
===================================================================
--- libvirt-5.10.0.orig/docs/news.xml
+++ libvirt-5.10.0/docs/news.xml
@@ -42,7 +42,7 @@
-->
<libvirt>
- <release version="v5.10.0" date="2019-12-2">
+ <release version="v5.10.0" date="2019-12-02">
<section title="New features">
<change>
<summary>

87
2552752f-libxl-fix-lock-manager-lock-ordering.patch
View File

@ -1,87 +0,0 @@
commit 2552752f0b6504a80f6306e5aae2c7063d24f1ab
Author: Jim Fehlig <jfehlig@suse.com>
Date: Mon Oct 14 14:01:00 2019 -0600
libxl: Fix lock manager lock ordering
The ordering of lock manager locks in the libxl driver has a flaw that was
uncovered by a migration error path. In the perform phase of migration, the
source host calls virDomainLockProcessPause to release the lock before
sending the VM to the destination host. If the send fails an attempt is made
to reacquire the lock with virDomainLockProcessResume, but that too can fail
if the destination host has not finished cleaning up the failed VM and
releasing the lock it acquired when starting to receive the VM.
This change delays calling virDomainLockProcessResume in libxlDomainStart
until the VM is successfully created, but before it is unpaused. A similar
approach is used by the qemu driver, avoiding the need to release the lock
if VM creation fails. In the migration perform phase, releasing the lock
with virDomainLockProcessPause is delayed until the VM is successfully
sent to the destination, which avoids reacquiring the lock if the send
fails.
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Index: libvirt-5.9.0/src/libxl/libxl_domain.c
===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_domain.c
+++ libvirt-5.9.0/src/libxl/libxl_domain.c
@@ -1347,13 +1347,6 @@ libxlDomainStart(libxlDriverPrivatePtr d
NULL) < 0)
goto cleanup;
- if (virDomainLockProcessResume(driver->lockManager,
- "xen:///system",
- vm,
- priv->lockState) < 0)
- goto cleanup;
- VIR_FREE(priv->lockState);
-
if (libxlNetworkPrepareDevices(vm->def) < 0)
goto cleanup_dom;
@@ -1436,6 +1429,13 @@ libxlDomainStart(libxlDriverPrivatePtr d
libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json);
+ if (virDomainLockProcessResume(driver->lockManager,
+ "xen:///system",
+ vm,
+ priv->lockState) < 0)
+ goto destroy_dom;
+ VIR_FREE(priv->lockState);
+
/* Always enable domain death events */
if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW))
goto destroy_dom;
Index: libvirt-5.9.0/src/libxl/libxl_migration.c
===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_migration.c
+++ libvirt-5.9.0/src/libxl/libxl_migration.c
@@ -1240,20 +1240,16 @@ libxlDomainMigrationSrcPerform(libxlDriv
sockfd = virNetSocketDupFD(sock, true);
virObjectUnref(sock);
- if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0)
- VIR_WARN("Unable to release lease on %s", vm->def->name);
- VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
-
/* suspend vm and send saved data to dst through socket fd */
virObjectUnlock(vm);
ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd);
virObjectLock(vm);
- if (ret < 0) {
- virDomainLockProcessResume(driver->lockManager,
- "xen:///system",
- vm,
- priv->lockState);
+ if (ret == 0) {
+ if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0)
+ VIR_WARN("Unable to release lease on %s", vm->def->name);
+ VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState));
+ } else {
/*
* Confirm phase will not be executed if perform fails. End the
* job started in begin phase.

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

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

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

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl3lY20ACgkQFViLJllr
6l0cdgf/RP8gH2stB2f1PxcbPkHIFdtkPjoWogHM5LST8CLt2NGhUd3oN9j7tNPj
bt55FfOF3ez8I0L9/bZsKjmIC2nEB2mMbNrkzvcmbuq2CKsg3EUiW2BEMHUCshf3
d5Ec+RmbyrZ28f0Ry1aUzEeGypTKGcZJCYwGkORUya9uTtOzoyeACWtP7/ALrnae
/PpMEbh3iIeFevB9iDWRR1fm/t3GIE4xEy67z65GXCjgO63pYd7Z25viqNoqFu22
Bz57y+PVaEX4BFfOiMtfFOILYp6X4gQSWsd7sTFKXc6Itow4+nxek9MMc2Upy8tN
NZMS4G5q5nS1n9F4WTJbererlLEFmg==
=VGJJ
-----END PGP SIGNATURE-----

3
libvirt-5.9.0.tar.xz
View File

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

11
libvirt-5.9.0.tar.xz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl3BgfoACgkQFViLJllr
6l1PgggArP0WQI27JotDf+vvxoe21FwmtGJhsSC3l72yr4LZM8Ul45dD95j6RXVs
3t0SG6CIatQMqkrIRKqSMoT1cG3Y0fmpnmXfMutAp7q7TbuZ7z5fHTcDrgw2kBYE
GA+nxVM7/s1wOv2uivjPIFg3dbGpWwCcnXmrlZqiLuMuY1NcuOrez7iOIjnYJBe6
D5A8JDNueZhsddG2YUwbk8XbQGJe1Q/Gb+HlA6nm0Vwrlfrziz5Nz3QRI8pZ+5+Y
CK+6MmOqFcb5rmMwmEFmrhFG1ASg33x3rVJBCovyDO+2w3Lru91OYNx5AFyvLH0A
5KS1R6NyV6Vn9toeMowm9I2iXMyF3A==
=JGL6
-----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-5.9.0/src/cpu_map/ppc64_POWER8.xml Index: libvirt-5.10.0/src/cpu_map/ppc64_POWER8.xml
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/cpu_map/ppc64_POWER8.xml --- libvirt-5.10.0.orig/src/cpu_map/ppc64_POWER8.xml
+++ libvirt-5.9.0/src/cpu_map/ppc64_POWER8.xml +++ libvirt-5.10.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'/>

54
libvirt-suse-netcontrol.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-5.9.0/configure.ac Index: libvirt-5.10.0/configure.ac
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/configure.ac --- libvirt-5.10.0.orig/configure.ac
+++ libvirt-5.9.0/configure.ac +++ libvirt-5.10.0/configure.ac
@@ -279,6 +279,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.9.0/configure.ac
LIBVIRT_ARG_NLS LIBVIRT_ARG_NLS
LIBVIRT_ARG_NSS LIBVIRT_ARG_NSS
LIBVIRT_ARG_NUMACTL LIBVIRT_ARG_NUMACTL
@@ -323,6 +324,7 @@ LIBVIRT_CHECK_LIBSSH @@ -329,6 +330,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.9.0/configure.ac
LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NLS
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
@@ -1003,6 +1005,7 @@ LIBVIRT_RESULT_LIBXL @@ -1015,6 +1017,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.9.0/configure.ac
LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NLS
LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NSS
LIBVIRT_RESULT_NUMACTL LIBVIRT_RESULT_NUMACTL
Index: libvirt-5.9.0/tools/virsh.c Index: libvirt-5.10.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tools/virsh.c --- libvirt-5.10.0.orig/tools/virsh.c
+++ libvirt-5.9.0/tools/virsh.c +++ libvirt-5.10.0/tools/virsh.c
@@ -555,6 +555,8 @@ virshShowVersion(vshControl *ctl G_GNUC_ @@ -555,6 +555,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
vshPrint(ctl, " Interface"); vshPrint(ctl, " Interface");
# if defined(WITH_NETCF) # if defined(WITH_NETCF)
@ -39,10 +39,10 @@ Index: libvirt-5.9.0/tools/virsh.c
# elif defined(WITH_UDEV) # elif defined(WITH_UDEV)
vshPrint(ctl, " udev"); vshPrint(ctl, " udev");
# endif # endif
Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c Index: libvirt-5.10.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/interface/interface_backend_netcf.c --- libvirt-5.10.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-5.9.0/src/interface/interface_backend_netcf.c +++ libvirt-5.10.0/src/interface/interface_backend_netcf.c
@@ -21,7 +21,12 @@ @@ -21,7 +21,12 @@
#include <config.h> #include <config.h>
@ -95,7 +95,7 @@ Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c
static void static void
virNetcfDriverStateDispose(void *obj) virNetcfDriverStateDispose(void *obj)
@@ -123,6 +159,10 @@ netcfStateInitialize(bool privileged, @@ -120,6 +156,10 @@ netcfStateInitialize(bool privileged,
virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
goto error; goto error;
@ -106,7 +106,7 @@ Index: libvirt-5.9.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",
@@ -1117,6 +1157,7 @@ static int netcfInterfaceIsActive(virInt @@ -1114,6 +1154,7 @@ static int netcfInterfaceIsActive(virInt
return ret; return ret;
} }
@ -114,7 +114,7 @@ Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c
static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags) static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
{ {
int ret; int ret;
@@ -1191,6 +1232,7 @@ static int netcfInterfaceChangeRollback( @@ -1188,6 +1229,7 @@ static int netcfInterfaceChangeRollback(
virObjectUnlock(driver); virObjectUnlock(driver);
return ret; return ret;
} }
@ -122,7 +122,7 @@ Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c
static virInterfaceDriver interfaceDriver = { static virInterfaceDriver interfaceDriver = {
.name = INTERFACE_DRIVER_NAME, .name = INTERFACE_DRIVER_NAME,
@@ -1207,9 +1249,11 @@ static virInterfaceDriver interfaceDrive @@ -1204,9 +1246,11 @@ static virInterfaceDriver interfaceDrive
.interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */ .interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
.interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */ .interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
.interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */ .interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
@ -134,7 +134,7 @@ Index: libvirt-5.9.0/src/interface/interface_backend_netcf.c
}; };
@@ -1240,6 +1284,19 @@ static virStateDriver interfaceStateDriv @@ -1237,6 +1281,19 @@ static virStateDriver interfaceStateDriv
int netcfIfaceRegister(void) int netcfIfaceRegister(void)
{ {
@ -154,10 +154,10 @@ Index: libvirt-5.9.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.9.0/src/interface/interface_driver.c Index: libvirt-5.10.0/src/interface/interface_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/interface/interface_driver.c --- libvirt-5.10.0.orig/src/interface/interface_driver.c
+++ libvirt-5.9.0/src/interface/interface_driver.c +++ libvirt-5.10.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;
@ -175,10 +175,10 @@ Index: libvirt-5.9.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.9.0/m4/virt-netcontrol.m4 Index: libvirt-5.10.0/m4/virt-netcontrol.m4
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.9.0/m4/virt-netcontrol.m4 +++ libvirt-5.10.0/m4/virt-netcontrol.m4
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+dnl The libnetcontrol library +dnl The libnetcontrol library
+dnl +dnl
@ -219,10 +219,10 @@ Index: libvirt-5.9.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.9.0/src/interface/Makefile.inc.am Index: libvirt-5.10.0/src/interface/Makefile.inc.am
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/interface/Makefile.inc.am --- libvirt-5.10.0.orig/src/interface/Makefile.inc.am
+++ libvirt-5.9.0/src/interface/Makefile.inc.am +++ libvirt-5.10.0/src/interface/Makefile.inc.am
@@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \ @@ -6,6 +6,7 @@ INTERFACE_DRIVER_SOURCES = \
$(NULL) $(NULL)
@ -230,8 +230,8 @@ Index: libvirt-5.9.0/src/interface/Makefile.inc.am
+INTERFACE_DRIVER_NETCONTROL_SOURCES = interface/interface_backend_netcf.c +INTERFACE_DRIVER_NETCONTROL_SOURCES = interface/interface_backend_netcf.c
INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c
DRIVER_SOURCE_FILES += $(INTERFACE_DRIVER_SOURCES) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
@@ -36,6 +37,11 @@ libvirt_driver_interface_la_CFLAGS += $( @@ -38,6 +39,11 @@ libvirt_driver_interface_la_CFLAGS += $(
libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS)
libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES) libvirt_driver_interface_la_SOURCES += $(INTERFACE_DRIVER_NETCF_SOURCES)
endif WITH_NETCF endif WITH_NETCF

18
libvirt.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Dec 2 23:24:23 UTC 2019 - James Fehlig <jfehlig@suse.com>
- Update to libvirt 5.10.0
- bsc#1157149
- Many incremental improvements and bug fixes, see
https://libvirt.org/news.html
- Dropped patches:
2552752f-libxl-fix-lock-manager-lock-ordering.patch
- Added patches:
0a65cba4-news-fix.patch
-------------------------------------------------------------------
Wed Nov 27 20:26:03 UTC 2019 - James Fehlig <jfehlig@suse.com>
- spec: Enable 'libvirt' firewalld zone for firewalld >= 0.7.0
boo#1157766
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 14 17:31:35 UTC 2019 - James Fehlig <jfehlig@suse.com> Thu Nov 14 17:31:35 UTC 2019 - James Fehlig <jfehlig@suse.com>

39
libvirt.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libvirt # spec file for package libvirt
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,11 +16,14 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017 # Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
%endif %endif
# libvirt does not support building in srcdir
%define _vpath_builddir %{_target_platform}
# The hypervisor drivers that run in libvirtd # The hypervisor drivers that run in libvirtd
%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}
@ -105,6 +108,11 @@
%define with_firewalld 1 %define with_firewalld 1
%endif %endif
# The 'libvirt' zone must be used with firewalld >= 0.7.0
%if 0%{?suse_version} >= 1550
%define with_firewalld_zone 1
%endif
# Enable libssh support in newer code bases # Enable libssh support in newer code bases
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%define with_libssh 1 %define with_libssh 1
@ -182,8 +190,8 @@
%endif %endif
Name: libvirt Name: libvirt
Url: http://libvirt.org/ URL: http://libvirt.org/
Version: 5.9.0 Version: 5.10.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
@ -243,9 +251,6 @@ BuildRequires: libxslt
BuildRequires: perl BuildRequires: perl
BuildRequires: python3 BuildRequires: python3
BuildRequires: readline-devel BuildRequires: readline-devel
# perl XPath is needed since we have a patch touching files that cause
# hvsupport.html to be regenerated
BuildRequires: perl(XML::XPath)
# rpcgen is needed since we have a patch touching remote_protocol.x # rpcgen is needed since we have a patch touching remote_protocol.x
BuildRequires: rpcgen BuildRequires: rpcgen
# For pool-build probing for existing pools # For pool-build probing for existing pools
@ -338,7 +343,7 @@ Source6: libvirtd-relocation-server.xml
Source99: baselibs.conf Source99: baselibs.conf
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# Upstream patches # Upstream patches
Patch0: 2552752f-libxl-fix-lock-manager-lock-ordering.patch Patch0: 0a65cba4-news-fix.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
@ -1026,9 +1031,13 @@ libvirt plugin for NSS for translating domain names into IP addresses.
%endif %endif
autoreconf -f -i autoreconf -f -i
%define _configure ../configure
mkdir %{_vpath_builddir}
cd %{_vpath_builddir}
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export PYTHON=%{_bindir}/python3 export PYTHON=%{_bindir}/python3
%configure --disable-static \ %configure --disable-static \
--enable-dependency-tracking \
--with-runstatedir=%{_rundir} \ --with-runstatedir=%{_rundir} \
%{?arg_qemu} \ %{?arg_qemu} \
%{?arg_openvz} \ %{?arg_openvz} \
@ -1093,11 +1102,11 @@ export PYTHON=%{_bindir}/python3
ac_cv_path_PARTED=/usr/sbin/parted \ ac_cv_path_PARTED=/usr/sbin/parted \
ac_cv_path_QEMU_BRIDGE_HELPER=/usr/lib/qemu-bridge-helper ac_cv_path_QEMU_BRIDGE_HELPER=/usr/lib/qemu-bridge-helper
%make_build HTML_DIR=%{_docdir}/%{name} %make_build HTML_DIR=%{_docdir}/%{name}
gzip -9 ChangeLog
%install %install
cd %{_vpath_builddir}
%make_install SYSTEMD_UNIT_DIR=%{_unitdir} HTML_DIR=%{_docdir}/%{name} %make_install SYSTEMD_UNIT_DIR=%{_unitdir} HTML_DIR=%{_docdir}/%{name}
cp examples/sh/virt-lxc-convert %{buildroot}/%{_bindir} cp ../examples/sh/virt-lxc-convert %{buildroot}/%{_bindir}
rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/*.la
%if %{with_wireshark} %if %{with_wireshark}
rm -f %{buildroot}/%{wireshark_plugindir}/libvirt.la rm -f %{buildroot}/%{wireshark_plugindir}/libvirt.la
@ -1235,11 +1244,10 @@ do
rm -f $i rm -f $i
printf 'int main(void) { return 0; }' > $i.c printf 'int main(void) { return 0; }' > $i.c
done done
%make_build cd ../%{_vpath_builddir}
if ! %make_build check VIR_TEST_DEBUG=1 if ! %make_build check VIR_TEST_DEBUG=1
then then
cat test-suite.log || true cat tests/test-suite.log || true
exit 1 exit 1
fi fi
@ -1604,6 +1612,7 @@ fi
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver
%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
%if %{with_firewalld_zone} %if %{with_firewalld_zone}
%dir %{_prefix}/lib/firewalld/zones/
%{_prefix}/lib/firewalld/zones/libvirt.xml %{_prefix}/lib/firewalld/zones/libvirt.xml
%endif %endif
@ -1831,8 +1840,8 @@ fi
%{_unitdir}/libvirt-guests.service %{_unitdir}/libvirt-guests.service
%{_sbindir}/rclibvirt-guests %{_sbindir}/rclibvirt-guests
%files libs -f %{name}.lang %files libs -f %{_vpath_builddir}/%{name}.lang
%doc AUTHORS ChangeLog.gz NEWS README README.md COPYING COPYING.LESSER %doc AUTHORS NEWS README README.md COPYING COPYING.LESSER
%config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf %config(noreplace) %{_sysconfdir}/%{name}/libvirt.conf
%config(noreplace) %{_sysconfdir}/%{name}/libvirt-admin.conf %config(noreplace) %{_sysconfdir}/%{name}/libvirt-admin.conf
%{_libdir}/libvirt.so.* %{_libdir}/libvirt.so.*

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-5.9.0/src/libxl/libxl_driver.c Index: libvirt-5.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c --- libvirt-5.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c +++ libvirt-5.10.0/src/libxl/libxl_driver.c
@@ -1365,6 +1365,61 @@ libxlDomainReboot(virDomainPtr dom, unsi @@ -1363,6 +1363,61 @@ libxlDomainReboot(virDomainPtr dom, unsi
} }
static int static int
@ -74,7 +74,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_driver.c
libxlDomainDestroyFlags(virDomainPtr dom, libxlDomainDestroyFlags(virDomainPtr dom,
unsigned int flags) unsigned int flags)
{ {
@@ -6599,6 +6654,7 @@ static virHypervisorDriver libxlHypervis @@ -6593,6 +6648,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 */

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-5.9.0/src/libxl/libxl_conf.c Index: libvirt-5.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c --- libvirt-5.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c +++ libvirt-5.10.0/src/libxl/libxl_conf.c
@@ -880,6 +880,30 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -869,6 +869,30 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }
@ -38,7 +38,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_conf.c
static char * static char *
libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src, libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
const char *username, const char *username,
@@ -1121,6 +1145,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1110,6 +1134,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;

74
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-5.9.0/include/libvirt/libvirt-domain.h Index: libvirt-5.10.0/include/libvirt/libvirt-domain.h
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/include/libvirt/libvirt-domain.h --- libvirt-5.10.0.orig/include/libvirt/libvirt-domain.h
+++ libvirt-5.9.0/include/libvirt/libvirt-domain.h +++ libvirt-5.10.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.9.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.9.0/src/libxl/libxl_driver.c Index: libvirt-5.10.0/src/libxl/libxl_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_driver.c --- libvirt-5.10.0.orig/src/libxl/libxl_driver.c
+++ libvirt-5.9.0/src/libxl/libxl_driver.c +++ libvirt-5.10.0/src/libxl/libxl_driver.c
@@ -6145,6 +6145,9 @@ libxlDomainMigratePerform3Params(virDoma @@ -6139,6 +6139,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.9.0/src/libxl/libxl_driver.c
#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
virReportUnsupportedError(); virReportUnsupportedError();
@@ -6161,6 +6164,18 @@ libxlDomainMigratePerform3Params(virDoma @@ -6155,6 +6158,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.9.0/src/libxl/libxl_driver.c
virTypedParamsGetString(params, nparams, virTypedParamsGetString(params, nparams,
VIR_MIGRATE_PARAM_URI, VIR_MIGRATE_PARAM_URI,
&uri) < 0) &uri) < 0)
@@ -6175,11 +6190,11 @@ libxlDomainMigratePerform3Params(virDoma @@ -6169,11 +6184,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.9.0/src/libxl/libxl_driver.c
goto cleanup; goto cleanup;
} }
Index: libvirt-5.9.0/src/libxl/libxl_migration.c Index: libvirt-5.10.0/src/libxl/libxl_migration.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_migration.c --- libvirt-5.10.0.orig/src/libxl/libxl_migration.c
+++ libvirt-5.9.0/src/libxl/libxl_migration.c +++ libvirt-5.10.0/src/libxl/libxl_migration.c
@@ -338,18 +338,39 @@ libxlMigrateDstReceive(virNetSocketPtr s @@ -338,18 +338,39 @@ libxlMigrateDstReceive(virNetSocketPtr s
static int static int
libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver,
@ -145,7 +145,7 @@ Index: libvirt-5.9.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-5.9.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-5.9.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 G_GNUC_UNUSED, const char *dconnuri G_GNUC_UNUSED,
const char *dname, const char *dname,
const char *uri, const char *uri,
@ -172,7 +172,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
{ {
virDomainPtr ddomain = NULL; virDomainPtr ddomain = NULL;
virTypedParameterPtr params = NULL; virTypedParameterPtr params = NULL;
@@ -1020,11 +1041,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1017,11 +1038,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 perspective. * as it looks to be normal migration from the receiver perspective.
*/ */
@ -186,7 +186,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
if (!(st = virStreamNew(dconn, 0))) if (!(st = virStreamNew(dconn, 0)))
goto confirm; goto confirm;
ret = dconn->driver->domainMigratePrepareTunnel3Params ret = dconn->driver->domainMigratePrepareTunnel3Params
@@ -1038,7 +1059,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1035,7 +1056,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
if (ret == -1) if (ret == -1)
goto confirm; goto confirm;
@ -195,7 +195,7 @@ Index: libvirt-5.9.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) {
@@ -1053,11 +1074,11 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1050,11 +1071,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-5.9.0/src/libxl/libxl_migration.c
if (ret < 0) { if (ret < 0) {
notify_source = false; notify_source = false;
virErrorPreserveLast(&orig_err); virErrorPreserveLast(&orig_err);
@@ -1092,7 +1113,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1089,7 +1110,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
confirm: confirm:
if (notify_source) { if (notify_source) {
VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm);
@ -219,7 +219,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
if (ret < 0) if (ret < 0)
VIR_WARN("Guest %s probably left in 'paused' state on source", VIR_WARN("Guest %s probably left in 'paused' state on source",
@@ -1100,7 +1121,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP @@ -1097,7 +1118,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivateP
} }
cleanup: cleanup:
@ -228,7 +228,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
libxlMigrationSrcStopTunnel(tc); libxlMigrationSrcStopTunnel(tc);
virObjectUnref(st); virObjectUnref(st);
} }
@@ -1144,7 +1165,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD @@ -1141,7 +1162,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
const char *dconnuri, const char *dconnuri,
const char *uri_str G_GNUC_UNUSED, const char *uri_str G_GNUC_UNUSED,
const char *dname, const char *dname,
@ -237,7 +237,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
{ {
int ret = -1; int ret = -1;
bool useParams; bool useParams;
@@ -1179,7 +1200,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD @@ -1176,7 +1197,7 @@ libxlDomainMigrationSrcPerformP2P(libxlD
} }
ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri,
@ -246,7 +246,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
if (ret < 0) { if (ret < 0) {
/* /*
@@ -1206,7 +1227,7 @@ libxlDomainMigrationSrcPerform(libxlDriv @@ -1203,7 +1224,7 @@ libxlDomainMigrationSrcPerform(libxlDriv
const char *dconnuri G_GNUC_UNUSED, const char *dconnuri G_GNUC_UNUSED,
const char *uri_str, const char *uri_str,
const char *dname G_GNUC_UNUSED, const char *dname G_GNUC_UNUSED,
@ -255,7 +255,7 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
{ {
libxlDomainObjPrivatePtr priv = vm->privateData; libxlDomainObjPrivatePtr priv = vm->privateData;
char *hostname = NULL; char *hostname = NULL;
@@ -1242,7 +1263,7 @@ libxlDomainMigrationSrcPerform(libxlDriv @@ -1239,7 +1260,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);
@ -264,10 +264,10 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.c
virObjectLock(vm); virObjectLock(vm);
if (ret == 0) { if (ret == 0) {
Index: libvirt-5.9.0/src/libxl/libxl_migration.h Index: libvirt-5.10.0/src/libxl/libxl_migration.h
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_migration.h --- libvirt-5.10.0.orig/src/libxl/libxl_migration.h
+++ libvirt-5.9.0/src/libxl/libxl_migration.h +++ libvirt-5.10.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,11 +312,11 @@ Index: libvirt-5.9.0/src/libxl/libxl_migration.h
virDomainPtr virDomainPtr
libxlDomainMigrationDstFinish(virConnectPtr dconn, libxlDomainMigrationDstFinish(virConnectPtr dconn,
Index: libvirt-5.9.0/tools/virsh-domain.c Index: libvirt-5.10.0/tools/virsh-domain.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tools/virsh-domain.c --- libvirt-5.10.0.orig/tools/virsh-domain.c
+++ libvirt-5.9.0/tools/virsh-domain.c +++ libvirt-5.10.0/tools/virsh-domain.c
@@ -10542,6 +10542,22 @@ static const vshCmdOptDef opts_migrate[] @@ -10524,6 +10524,22 @@ static const vshCmdOptDef opts_migrate[]
.type = VSH_OT_INT, .type = VSH_OT_INT,
.help = N_("migration bandwidth limit in MiB/s") .help = N_("migration bandwidth limit in MiB/s")
}, },
@ -339,7 +339,7 @@ Index: libvirt-5.9.0/tools/virsh-domain.c
{.name = NULL} {.name = NULL}
}; };
@@ -10565,6 +10581,7 @@ doMigrate(void *opaque) @@ -10547,6 +10563,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.9.0/tools/virsh-domain.c
sigemptyset(&sigmask); sigemptyset(&sigmask);
sigaddset(&sigmask, SIGINT); sigaddset(&sigmask, SIGINT);
@@ -10684,6 +10701,27 @@ doMigrate(void *opaque) @@ -10666,6 +10683,27 @@ doMigrate(void *opaque)
goto save_error; goto save_error;
} }
@ -375,11 +375,11 @@ Index: libvirt-5.9.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.9.0/tools/virsh.pod Index: libvirt-5.10.0/tools/virsh.pod
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tools/virsh.pod --- libvirt-5.10.0.orig/tools/virsh.pod
+++ libvirt-5.9.0/tools/virsh.pod +++ libvirt-5.10.0/tools/virsh.pod
@@ -2254,6 +2254,14 @@ I<--parallel-connections>. Parallel conn @@ -2265,6 +2265,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.

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-5.9.0/src/libxl/libxl_conf.c Index: libvirt-5.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c --- libvirt-5.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c +++ libvirt-5.10.0/src/libxl/libxl_conf.c
@@ -880,6 +880,25 @@ libxlDiskSetDiscard(libxl_device_disk *x @@ -869,6 +869,25 @@ libxlDiskSetDiscard(libxl_device_disk *x
#endif #endif
} }
@ -37,7 +37,7 @@ Index: libvirt-5.9.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)
{ {
@@ -1020,6 +1039,7 @@ libxlMakeNetworkDiskSrc(virStorageSource @@ -1009,6 +1028,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-5.9.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);
@@ -1035,7 +1055,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1024,7 +1044,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-5.9.0/src/libxl/libxl_conf.c
} }
x_disk->vdev = g_strdup(l_disk->dst); x_disk->vdev = g_strdup(l_disk->dst);
@@ -1146,6 +1166,9 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk @@ -1135,6 +1155,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);

26
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-5.9.0/src/lxc/lxc_controller.c Index: libvirt-5.10.0/src/lxc/lxc_controller.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/lxc/lxc_controller.c --- libvirt-5.10.0.orig/src/lxc/lxc_controller.c
+++ libvirt-5.9.0/src/lxc/lxc_controller.c +++ libvirt-5.10.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"
@ -25,7 +25,7 @@ Index: libvirt-5.9.0/src/lxc/lxc_controller.c
#define VIR_FROM_THIS VIR_FROM_LXC #define VIR_FROM_THIS VIR_FROM_LXC
@@ -2010,6 +2011,7 @@ static int virLXCControllerDeleteInterfa @@ -1985,6 +1986,7 @@ static int virLXCControllerDeleteInterfa
if (virNetDevVethDelete(ctrl->veths[i]) < 0) if (virNetDevVethDelete(ctrl->veths[i]) < 0)
ret = -1; ret = -1;
} }
@ -33,10 +33,10 @@ Index: libvirt-5.9.0/src/lxc/lxc_controller.c
return ret; return ret;
} }
Index: libvirt-5.9.0/src/lxc/lxc_driver.c Index: libvirt-5.10.0/src/lxc/lxc_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/lxc/lxc_driver.c --- libvirt-5.10.0.orig/src/lxc/lxc_driver.c
+++ libvirt-5.9.0/src/lxc/lxc_driver.c +++ libvirt-5.10.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"
@ -45,7 +45,7 @@ Index: libvirt-5.9.0/src/lxc/lxc_driver.c
#include "virstring.h" #include "virstring.h"
#include "viraccessapicheck.h" #include "viraccessapicheck.h"
#include "viraccessapichecklxc.h" #include "viraccessapichecklxc.h"
@@ -3919,6 +3920,7 @@ lxcDomainAttachDeviceNetLive(virConnectP @@ -3918,6 +3919,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-5.9.0/src/lxc/lxc_driver.c
break; break;
case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_DIRECT:
@@ -4363,6 +4365,7 @@ lxcDomainDetachDeviceNetLive(virDomainOb @@ -4359,6 +4361,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-5.9.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.9.0/src/lxc/lxc_process.c Index: libvirt-5.10.0/src/lxc/lxc_process.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/lxc/lxc_process.c --- libvirt-5.10.0.orig/src/lxc/lxc_process.c
+++ libvirt-5.9.0/src/lxc/lxc_process.c +++ libvirt-5.10.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-5.9.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
@@ -232,6 +233,7 @@ static void virLXCProcessCleanup(virLXCD @@ -231,6 +232,7 @@ static void virLXCProcessCleanup(virLXCD
VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname)); VIR_WARN("Unable to release network device '%s'", NULLSTR(iface->ifname));
} }
} }

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-5.9.0/src/network/bridge_driver.c Index: libvirt-5.10.0/src/network/bridge_driver.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/network/bridge_driver.c --- libvirt-5.10.0.orig/src/network/bridge_driver.c
+++ libvirt-5.9.0/src/network/bridge_driver.c +++ libvirt-5.10.0/src/network/bridge_driver.c
@@ -1512,7 +1512,14 @@ networkDnsmasqConfContents(virNetworkObj @@ -1499,7 +1499,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.9.0/src/network/bridge_driver.c
} }
if (ipdef->tftproot) { if (ipdef->tftproot) {
Index: libvirt-5.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf Index: libvirt-5.10.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf --- libvirt-5.10.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
+++ libvirt-5.9.0/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ libvirt-5.10.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-5.9.0/src/util/virarch.c Index: libvirt-5.10.0/src/util/virarch.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/util/virarch.c --- libvirt-5.10.0.orig/src/util/virarch.c
+++ libvirt-5.9.0/src/util/virarch.c +++ libvirt-5.10.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")) {

6
qemu-apparmor-screenshot.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-5.9.0/src/security/apparmor/libvirt-qemu Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-5.10.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu +++ libvirt-5.10.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,

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

@ -8,11 +8,11 @@ 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.9.0/src/libxl/xen_common.c Index: libvirt-5.10.0/src/libxl/xen_common.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/xen_common.c --- libvirt-5.10.0.orig/src/libxl/xen_common.c
+++ libvirt-5.9.0/src/libxl/xen_common.c +++ libvirt-5.10.0/src/libxl/xen_common.c
@@ -383,12 +383,19 @@ xenParsePCI(char *entry) @@ -381,12 +381,19 @@ xenParsePCI(char *entry)
int busID; int busID;
int slotID; int slotID;
int funcID; int funcID;
@ -32,7 +32,7 @@ Index: libvirt-5.9.0/src/libxl/xen_common.c
if (!(nextkey = strchr(key, ':'))) if (!(nextkey = strchr(key, ':')))
return NULL; return NULL;
if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) { if (virStrncpy(domain, key, (nextkey - key), sizeof(domain)) < 0) {
@@ -433,10 +440,30 @@ xenParsePCI(char *entry) @@ -431,10 +438,30 @@ xenParsePCI(char *entry)
if (virStrToLong_i(func, NULL, 16, &funcID) < 0) if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
return NULL; return NULL;

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-5.9.0/src/security/apparmor/libvirt-qemu Index: libvirt-5.10.0/src/security/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/security/apparmor/libvirt-qemu --- libvirt-5.10.0.orig/src/security/apparmor/libvirt-qemu
+++ libvirt-5.9.0/src/security/apparmor/libvirt-qemu +++ libvirt-5.10.0/src/security/apparmor/libvirt-qemu
@@ -63,6 +63,7 @@ @@ -63,6 +63,7 @@
#/dev/fb* rw, #/dev/fb* rw,
@ -20,10 +20,10 @@ Index: libvirt-5.9.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.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-5.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-5.10.0.orig/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
+++ libvirt-5.9.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ libvirt-5.10.0/src/security/apparmor/usr.lib.libvirt.virt-aa-helper
@@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/ @@ -20,7 +20,7 @@ profile virt-aa-helper /usr/{lib,lib64}/
# Used when internally running another command (namely apparmor_parser) # Used when internally running another command (namely apparmor_parser)
@{PROC}/@{pid}/fd/ r, @{PROC}/@{pid}/fd/ r,

12
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-5.9.0/tools/libvirt-guests.sh.in Index: libvirt-5.10.0/tools/libvirt-guests.sh.in
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tools/libvirt-guests.sh.in --- libvirt-5.10.0.orig/tools/libvirt-guests.sh.in
+++ libvirt-5.9.0/tools/libvirt-guests.sh.in +++ libvirt-5.10.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.9.0/tools/libvirt-guests.sh.in
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-5.9.0/tools/libvirt-guests.sysconf Index: libvirt-5.10.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/tools/libvirt-guests.sysconf --- libvirt-5.10.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-5.9.0/tools/libvirt-guests.sysconf +++ libvirt-5.10.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt-guests +## Path: System/Virtualization/libvirt-guests
+ +

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

@ -3,11 +3,11 @@ 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.9.0/src/remote/remote_daemon_config.c Index: libvirt-5.10.0/src/remote/remote_daemon_config.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/remote/remote_daemon_config.c --- libvirt-5.10.0.orig/src/remote/remote_daemon_config.c
+++ libvirt-5.9.0/src/remote/remote_daemon_config.c +++ libvirt-5.10.0/src/remote/remote_daemon_config.c
@@ -107,7 +107,7 @@ daemonConfigNew(bool privileged G_GNUC_U @@ -104,7 +104,7 @@ daemonConfigNew(bool privileged G_GNUC_U
#ifdef WITH_IP #ifdef WITH_IP
# ifdef LIBVIRTD # ifdef LIBVIRTD
@ -16,10 +16,10 @@ Index: libvirt-5.9.0/src/remote/remote_daemon_config.c
# else /* ! LIBVIRTD */ # else /* ! LIBVIRTD */
data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */ data->listen_tls = 0; /* Always honoured, --listen doesn't exist. */
# endif /* ! LIBVIRTD */ # endif /* ! LIBVIRTD */
Index: libvirt-5.9.0/src/remote/libvirtd.conf.in Index: libvirt-5.10.0/src/remote/libvirtd.conf.in
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/remote/libvirtd.conf.in --- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in
+++ libvirt-5.9.0/src/remote/libvirtd.conf.in +++ libvirt-5.10.0/src/remote/libvirtd.conf.in
@@ -17,8 +17,8 @@ @@ -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.

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-5.9.0/src/remote/libvirtd.sysconf Index: libvirt-5.10.0/src/remote/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/remote/libvirtd.sysconf --- libvirt-5.10.0.orig/src/remote/libvirtd.sysconf
+++ libvirt-5.9.0/src/remote/libvirtd.sysconf +++ libvirt-5.10.0/src/remote/libvirtd.sysconf
@@ -1,5 +1,9 @@ @@ -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

43
suse-libxl-disable-autoballoon.patch
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.9.0/src/libxl/libxl.conf Index: libvirt-5.10.0/src/libxl/libxl.conf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl.conf --- libvirt-5.10.0.orig/src/libxl/libxl.conf
+++ libvirt-5.9.0/src/libxl/libxl.conf +++ libvirt-5.10.0/src/libxl/libxl.conf
@@ -4,12 +4,11 @@ @@ -4,12 +4,11 @@
# Enable autoballooning of domain0 # Enable autoballooning of domain0
@ -27,19 +27,11 @@ Index: libvirt-5.9.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.9.0/src/libxl/libxl_conf.c Index: libvirt-5.10.0/src/libxl/libxl_conf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/libxl/libxl_conf.c --- libvirt-5.10.0.orig/src/libxl/libxl_conf.c
+++ libvirt-5.9.0/src/libxl/libxl_conf.c +++ libvirt-5.10.0/src/libxl/libxl_conf.c
@@ -22,7 +22,6 @@ @@ -1704,15 +1704,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
#include <config.h>
-#include <regex.h>
#include <libxl.h>
#include <sys/types.h>
#include <sys/socket.h>
@@ -1715,14 +1714,12 @@ libxlMakeBuildInfoVfb(virPortAllocatorRa
/* /*
* Get domain0 autoballoon configuration. Honor user-specified * Get domain0 autoballoon configuration. Honor user-specified
* setting in libxl.conf first. If not specified, autoballooning * setting in libxl.conf first. If not specified, autoballooning
@ -51,29 +43,24 @@ Index: libvirt-5.9.0/src/libxl/libxl_conf.c
libxlGetAutoballoonConf(libxlDriverConfigPtr cfg, libxlGetAutoballoonConf(libxlDriverConfigPtr cfg,
virConfPtr conf) virConfPtr conf)
{ {
- regex_t regex; - g_autoptr(GRegex) regex = NULL;
- g_autoptr(GError) err = NULL;
int res; int res;
res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon); res = virConfGetValueBool(conf, "autoballoon", &cfg->autoballoon);
@@ -1731,21 +1728,8 @@ libxlGetAutoballoonConf(libxlDriverConfi @@ -1721,15 +1718,8 @@ libxlGetAutoballoonConf(libxlDriverConfi
else if (res == 1) else if (res == 1)
return 0; return 0;
- if ((res = regcomp(&regex, - regex = g_regex_new("(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )",
- "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", - 0, 0, &err);
- REG_NOSUB | REG_EXTENDED)) != 0) { - if (!regex) {
- char error[100];
- regerror(res, &regex, error, sizeof(error));
- virReportError(VIR_ERR_INTERNAL_ERROR, - virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Failed to compile regex %s"), - _("Failed to compile regex %s"), err->message);
- error);
-
- return -1; - return -1;
- } - }
- -
- res = regexec(&regex, cfg->verInfo->commandline, 0, NULL, 0); - cfg->autoballoon = !g_regex_match(regex, cfg->verInfo->commandline, 0, NULL);
- regfree(&regex);
- cfg->autoballoon = res == REG_NOMATCH;
+ /* make it explicit */ + /* make it explicit */
+ cfg->autoballoon = 0; + cfg->autoballoon = 0;
return 0; return 0;

24
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-5.9.0/src/qemu/qemu.conf Index: libvirt-5.10.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/qemu/qemu.conf --- libvirt-5.10.0.orig/src/qemu/qemu.conf
+++ libvirt-5.9.0/src/qemu/qemu.conf +++ libvirt-5.10.0/src/qemu/qemu.conf
@@ -796,10 +796,9 @@ @@ -799,10 +799,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.
#nvram = [ #nvram = [
@ -18,11 +18,11 @@ Index: libvirt-5.9.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.9.0/src/qemu/qemu_conf.c Index: libvirt-5.10.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/qemu/qemu_conf.c --- libvirt-5.10.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.9.0/src/qemu/qemu_conf.c +++ libvirt-5.10.0/src/qemu/qemu_conf.c
@@ -96,10 +96,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver @@ -97,10 +97,9 @@ qemuDriverUnlock(virQEMUDriverPtr driver
#ifndef DEFAULT_LOADER_NVRAM #ifndef DEFAULT_LOADER_NVRAM
# define DEFAULT_LOADER_NVRAM \ # define DEFAULT_LOADER_NVRAM \
@ -36,11 +36,11 @@ Index: libvirt-5.9.0/src/qemu/qemu_conf.c
#endif #endif
Index: libvirt-5.9.0/src/security/virt-aa-helper.c Index: libvirt-5.10.0/src/security/virt-aa-helper.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/security/virt-aa-helper.c --- libvirt-5.10.0.orig/src/security/virt-aa-helper.c
+++ libvirt-5.9.0/src/security/virt-aa-helper.c +++ libvirt-5.10.0/src/security/virt-aa-helper.c
@@ -510,7 +510,8 @@ valid_path(const char *path, const bool @@ -490,7 +490,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 */

14
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-5.9.0/src/qemu/qemu.conf Index: libvirt-5.10.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/qemu/qemu.conf --- libvirt-5.10.0.orig/src/qemu/qemu.conf
+++ libvirt-5.9.0/src/qemu/qemu.conf +++ libvirt-5.10.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,11 +60,11 @@ Index: libvirt-5.9.0/src/qemu/qemu.conf
# #
#lock_manager = "lockd" #lock_manager = "lockd"
Index: libvirt-5.9.0/src/qemu/qemu_conf.c Index: libvirt-5.10.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-5.9.0.orig/src/qemu/qemu_conf.c --- libvirt-5.10.0.orig/src/qemu/qemu_conf.c
+++ libvirt-5.9.0/src/qemu/qemu_conf.c +++ libvirt-5.10.0/src/qemu/qemu_conf.c
@@ -271,7 +271,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf @@ -236,7 +236,7 @@ virQEMUDriverConfigPtr virQEMUDriverConf
cfg->clearEmulatorCapabilities = true; cfg->clearEmulatorCapabilities = true;

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

16
virt-create-rootfs.patch
View File

@ -1,8 +1,8 @@
Index: libvirt-5.8.0/tools/Makefile.am Index: libvirt-5.10.0/tools/Makefile.am
=================================================================== ===================================================================
--- libvirt-5.8.0.orig/tools/Makefile.am --- libvirt-5.10.0.orig/tools/Makefile.am
+++ libvirt-5.8.0/tools/Makefile.am +++ libvirt-5.10.0/tools/Makefile.am
@@ -59,6 +59,7 @@ PODFILES = \ @@ -60,6 +60,7 @@ PODFILES = \
virt-sanlock-cleanup.pod \ virt-sanlock-cleanup.pod \
virt-xml-validate.pod \ virt-xml-validate.pod \
virsh.pod \ virsh.pod \
@ -28,10 +28,10 @@ Index: libvirt-5.8.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.8.0/tools/virt-create-rootfs Index: libvirt-5.10.0/tools/virt-create-rootfs
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.8.0/tools/virt-create-rootfs +++ libvirt-5.10.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.8.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.8.0/tools/virt-create-rootfs.pod Index: libvirt-5.10.0/tools/virt-create-rootfs.pod
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-5.8.0/tools/virt-create-rootfs.pod +++ libvirt-5.10.0/tools/virt-create-rootfs.pod
@@ -0,0 +1,77 @@ @@ -0,0 +1,77 @@
+=head1 NAME +=head1 NAME
+ +