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 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
Index: libvirt-4.7.0/src/xenconfig/xen_sxpr.c
|
2015-10-13 19:02:37 +02:00
|
|
|
===================================================================
|
Accepting request 636920 from home:jfehlig:branches:Virtualization
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
2018-09-20 19:06:17 +02:00
|
|
|
--- libvirt-4.7.0.orig/src/xenconfig/xen_sxpr.c
|
|
|
|
+++ libvirt-4.7.0/src/xenconfig/xen_sxpr.c
|
2017-11-02 23:48:50 +01:00
|
|
|
@@ -501,10 +501,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
|