2015-10-13 19:02:37 +02:00
|
|
|
xen_sxpr: set disk type to BLOCK when driver is not tap or file
|
|
|
|
|
|
|
|
|
|
When parsing disk s-expression to virDomainDiskDef structure, explicitly
|
|
|
|
|
set type to VIR_STORAGE_TYPE_BLOCK for all drivers except 'tap', 'tap2',
|
|
|
|
|
and 'file'. This was implicitly done prior to commit 9673418c.
|
|
|
|
|
|
|
|
|
|
https://bugzilla.suse.com/show_bug.cgi?id=938228
|
|
|
|
|
|
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 04:00:39 +02:00
|
|
|
Index: libvirt-1.3.5/src/xenconfig/xen_sxpr.c
|
2015-10-13 19:02:37 +02:00
|
|
|
===================================================================
|
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 04:00:39 +02:00
|
|
|
--- libvirt-1.3.5.orig/src/xenconfig/xen_sxpr.c
|
|
|
|
|
+++ libvirt-1.3.5/src/xenconfig/xen_sxpr.c
|
2016-03-01 18:58:15 +01:00
|
|
|
@@ -506,10 +506,11 @@ xenParseSxprDisks(virDomainDefPtr def,
|
2015-10-13 19:02:37 +02:00
|
|
|
omnipotent, we can revisit this, perhaps stat()'ing
|
|
|
|
|
the src file in question */
|
|
|
|
|
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
|
|
|
|
|
- } else if (STREQ(virDomainDiskGetDriver(disk), "phy")) {
|
|
|
|
|
- virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
|
|
|
|
|
} else if (STREQ(virDomainDiskGetDriver(disk), "file")) {
|
|
|
|
|
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ /* Set type to BLOCK for drivers != {tap,tap2,file} */
|
|
|
|
|
+ virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
/* No CDROM media so can't really tell. We'll just
|
