libvirt/xen-pv-cdrom.patch
James Fehlig c7b51f773c Accepting request 400351 from home:jfehlig:branches:Virtualization
- Update to libvirt 1.3.5
  - Many incremental improvements and bug fixes, see
    http://libvirt.org/news.html
  - Dropped patches:
    e4d131b8-mv-virDomainDefPostParseInternal.patch,
    3e428670-post-parse-implicit-video.patch,
    538012c8-default-vram.patch, 96b21fb0-vram-tests.patch,
    400e716d-libxl-noprope-emulator.patch,
    b90c4b5f-tests-use-qemu-xen.patch,
    fccf2725-libxl-API-4.4.patch,
    5325123d-libxl-migv2-save-restore.patch,
    f9edcfa4-libxl-migv2-migration.patch,
    a1c9a81a-libxl-rbd-fix.patch,
    ba566428-libxl-dom-iface-addrs.patch
- spec: simplify and cleanup by removing many conditionals that
  are never toogled. Also drop conditionals for suse_version <
  1310

OBS-URL: https://build.opensuse.org/request/show/400351
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=538
2016-06-07 02:00:39 +00:00

22 lines
960 B
Diff

Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
===================================================================
--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c
+++ libvirt-1.3.5/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"));