97a0425e04
xen-4.5.1-testing-src.tar.bz2 - Dropped patches now contained in tarball 556c2cf2-x86-don-t-crash-mapping-a-page-using-EFI-rt-page-tables.patch 556d9718-efi-fix-allocation-problems-if-ExitBootServices-fails.patch 556eabf7-x86-apic-Disable-the-LAPIC-later-in-smp_send_stop.patch 556eac15-x86-crash-don-t-use-set_fixmap-in-the-crash-path.patch 55780aaa-efi-avoid-calling-boot-services-after-ExitBootServices.patch 55780aff-x86-EFI-fix-EFI_MEMORY_WP-handling.patch 55780b43-EFI-early-add-mapbs-to-map-EfiBootServices-Code-Data.patch 55780b97-EFI-support-default-attributes-to-map-Runtime-service-areas.patch - Replace 5124efbe-add-qxl-support.patch with the variant that finally made it upstream, 554cc211-libxl-add-qxl.patch - bsc#931627 - VUL-0: CVE-2015-4105: XSA-130: xen: Guest triggerable qemu MSI-X pass-through error messages qemu-MSI-X-latch-writes.patch - bsc#907514 - Bus fatal error & sles12 sudden reboot has been observed - bsc#910258 - SLES12 Xen host crashes with FATAL NMI after shutdown of guest with VT-d NIC - bsc#918984 - Bus fatal error & sles11-SP4 sudden reboot has been observed - bsc#923967 - Partner-L3: Bus fatal error & sles11-SP3 sudden reboot has been observed x86-MSI-X-teardown.patch x86-MSI-X-enable.patch x86-MSI-X-guest-mask.patch x86-MSI-X-maskall.patch qemu-MSI-X-enable-maskall.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=364
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
commit 3bcf91cbbd9a18db9ae7d594ffde7979774ed512
|
|
Author: Roger Pau Monne <roger.pau@xxxxxxxxxx>
|
|
Date: Wed Feb 12 11:15:17 2014 +0100
|
|
|
|
libxl: local attach support for PHY backends using scripts
|
|
|
|
Allow disks using the PHY backend to locally attach if using a script.
|
|
|
|
Signed-off-by: Roger Pau Monnà <roger.pau@xxxxxxxxxx>
|
|
Suggested-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
|
|
|
|
|
|
Index: xen-4.5.1-testing/tools/libxl/libxl.c
|
|
===================================================================
|
|
--- xen-4.5.1-testing.orig/tools/libxl/libxl.c
|
|
+++ xen-4.5.1-testing/tools/libxl/libxl.c
|
|
@@ -3053,6 +3053,16 @@ void libxl__device_disk_local_initiate_a
|
|
|
|
switch (disk->backend) {
|
|
case LIBXL_DISK_BACKEND_PHY:
|
|
+ if (disk->script != NULL) {
|
|
+ LOG(DEBUG, "trying to locally attach PHY device %s with script %s",
|
|
+ disk->pdev_path, disk->script);
|
|
+ libxl__prepare_ao_device(ao, &dls->aodev);
|
|
+ dls->aodev.callback = local_device_attach_cb;
|
|
+ device_disk_add(egc, LIBXL_TOOLSTACK_DOMID, disk,
|
|
+ &dls->aodev, libxl__alloc_vdev,
|
|
+ (void *) blkdev_start);
|
|
+ return;
|
|
+ }
|
|
LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "locally attaching PHY disk %s",
|
|
disk->pdev_path);
|
|
dev = disk->pdev_path;
|
|
@@ -3132,7 +3142,7 @@ static void local_device_attach_cb(libxl
|
|
}
|
|
|
|
dev = GCSPRINTF("/dev/%s", disk->vdev);
|
|
- LOG(DEBUG, "locally attaching qdisk %s", dev);
|
|
+ LOG(DEBUG, "locally attached disk %s", dev);
|
|
|
|
rc = libxl__device_from_disk(gc, LIBXL_TOOLSTACK_DOMID, disk, &device);
|
|
if (rc < 0)
|
|
@@ -3172,6 +3182,7 @@ void libxl__device_disk_local_initiate_d
|
|
if (!dls->diskpath) goto out;
|
|
|
|
switch (disk->backend) {
|
|
+ case LIBXL_DISK_BACKEND_PHY:
|
|
case LIBXL_DISK_BACKEND_QDISK:
|
|
if (disk->vdev != NULL) {
|
|
GCNEW(device);
|
|
@@ -3189,7 +3200,6 @@ void libxl__device_disk_local_initiate_d
|
|
/* disk->vdev == NULL; fall through */
|
|
default:
|
|
/*
|
|
- * Nothing to do for PHYSTYPE_PHY.
|
|
* For other device types assume that the blktap2 process is
|
|
* needed by the soon to be started domain and do nothing.
|
|
*/
|