forked from pool/libvirt
f39448844a
- Update to libvirt 3.2.0 - Many incremental improvements and bug fixes, see http://libvirt.org/news.html - Dropped patches: 67dcb797-virTimeBackOffWait-sleepcap.patch, 85af0b80-qemu-adaptive-montimeout.patch, d68cb4f55-extract-the-request-sending-code-from-virNetlin.patch, 754515b7d-add-virNetlinkDumpCommand.patch, 3ee35d7d6-more-uses-of-SYSCTL_PATH.patch, 5dd607059-add-virNetDevGetName.patch, 00d28a78b-check-accept_ra-before-enabling-ipv6-forward.patch - Add Conflicts=xendomains.service to libvirtd service suse-libvirtd-service.patch bsc#1015348 OBS-URL: https://build.opensuse.org/request/show/484775 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=595
22 lines
960 B
Diff
22 lines
960 B
Diff
Index: libvirt-3.2.0/src/xenconfig/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-3.2.0.orig/src/xenconfig/xen_sxpr.c
|
|
+++ libvirt-3.2.0/src/xenconfig/xen_sxpr.c
|
|
@@ -392,7 +392,7 @@ xenParseSxprVifRate(const char *rate, un
|
|
static int
|
|
xenParseSxprDisks(virDomainDefPtr def,
|
|
const struct sexpr *root,
|
|
- int hvm)
|
|
+ int hvm ATTRIBUTE_UNUSED)
|
|
{
|
|
const struct sexpr *cur, *node;
|
|
virDomainDiskDefPtr disk = NULL;
|
|
@@ -442,7 +442,6 @@ xenParseSxprDisks(virDomainDefPtr def,
|
|
/* There is a case without the uname to the CD-ROM device */
|
|
offset = strchr(dst, ':');
|
|
if (!offset ||
|
|
- !hvm ||
|
|
STRNEQ(offset, ":cdrom")) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
"%s", _("domain information incomplete, vbd has no src"));
|