fe31f9be81
do not understand the new PV driver protocol. - Upstream Xen version renamed to 4.0.0 in changeset 20624 & 20625. - fate#307594: HP-MCBS: XEN: support NR_CPUS=256 This is a spec file change (xen.spec) - bnc#555152 - "NAME" column in xentop (SLES11) output limited to 10 characters unlike SLES10 The update to c/s 20572 includes this fix (at c/s 20567). - Modify xen-paths.diff - Merge xend-tap-fix.patch to xen-domUloader.diff remove part of it which accepted by upstream - Load gntdev module in xend init script similar to blkbk, netbk, etc. - Backport dmmd from sles11/xen block-dmmd xen-qemu-iscsi-fix.patch xen.spec - Fix regression when create_vbd for tap xend-tap-fix.patch - Temporarily disable libxl because of libconfig dependency. - fate#302864 domUloader support lvm in disk domUloader.py Note: for test in Beta1, if not good, remove it - fate#302864 domUloader support fs on whole disk domUloader.py - Turn KMPs back on now that kernel side fix is checked in. - fate#304415 VMM: ability to switch networking mode Add vif-route-ifup to handle routed configurations using sysconfig scripts. vif-route-ifup.patch - fate#307540 USB for Xen VMs usb-add.patch - fate#305545 XEN extra descriptive field within xenstore add_des.patch - Update to Xen version 3.5.0 for the following features. fate#304226 XEN: FlexMigration feature of VT-x2 support fate#305004 Add SR-IOV PF and VF drivers to Vt-d enabled Xen fate#306830 T states in Xen controlling by MSR fate#306832 Fix for xen panic on new processors fate#306833 Westmere and Nehalem-EX: Add support for Pause Loop exiting feature for Xen fate#306835 Xen: server virtual power management enhacement fate#306837 VT-d2 - PCI SIG ATS support fate#306872 Xen: Node manager support P/T-states change when Vt-d enable fate#306873 Xen: SMP guest live migration may fail with hap=1 on NHM fate#306875 Westmere: LT-SX (Xen) fate#306891 RAS features for Xen: Add support for Machine Check and CPU/Memory online/offline features fate#307322 1GB page support in Xen fate#307324 Xen IOMMU support OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=26
90 lines
2.8 KiB
Diff
90 lines
2.8 KiB
Diff
From 9062564d79cb45029403cc998b48410e42ead924 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@suse.de>
|
|
Date: Tue, 10 Mar 2009 16:45:44 +0100
|
|
Subject: [PATCH 6/6] tapdisk-ioemu: Fix shutdown condition
|
|
|
|
Even when opening the only image a tapdisk-ioemu instance is
|
|
responsible for fails, it can't immediately shut down. blktapctrl
|
|
still wants to communicate with tapdisk-ioemu and close the disk.
|
|
|
|
This patch changes tapdisk-ioemu to count the connections to
|
|
blktapctrl rather than the number of opened disk images.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@suse.de>
|
|
---
|
|
hw/xen_blktap.c | 5 ++++-
|
|
tapdisk-ioemu.c | 13 ++++++++++---
|
|
2 files changed, 14 insertions(+), 4 deletions(-)
|
|
|
|
Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c
|
|
===================================================================
|
|
--- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
|
|
+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c
|
|
@@ -65,6 +65,7 @@ int read_fd;
|
|
int write_fd;
|
|
|
|
static pid_t process;
|
|
+int connected_disks = 0;
|
|
fd_list_entry_t *fd_start = NULL;
|
|
|
|
static void handle_blktap_iomsg(void* private);
|
|
@@ -541,6 +542,7 @@ static void handle_blktap_ctrlmsg(void*
|
|
|
|
/* Allocate the disk structs */
|
|
s = state_init();
|
|
+ connected_disks++;
|
|
|
|
/*Open file*/
|
|
if (s == NULL || open_disk(s, path, msg->drivertype, msg->readonly)) {
|
|
@@ -591,7 +593,8 @@ static void handle_blktap_ctrlmsg(void*
|
|
case CTLMSG_CLOSE:
|
|
s = get_state(msg->cookie);
|
|
if (s) unmap_disk(s);
|
|
- break;
|
|
+ connected_disks--;
|
|
+ break;
|
|
|
|
case CTLMSG_PID:
|
|
memset(buf, 0x00, MSG_SIZE);
|
|
Index: xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c
|
|
===================================================================
|
|
--- xen-4.0.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c
|
|
+++ xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c
|
|
@@ -14,6 +14,7 @@ extern void qemu_aio_init(void);
|
|
extern void qemu_aio_poll(void);
|
|
|
|
extern void *fd_start;
|
|
+extern int connected_disks;
|
|
|
|
int domid = 0;
|
|
FILE* logfile;
|
|
@@ -76,7 +77,7 @@ int main(void)
|
|
int max_fd;
|
|
fd_set rfds;
|
|
struct timeval tv;
|
|
- void *old_fd_start = NULL;
|
|
+ int old_connected_disks = 0;
|
|
|
|
/* Daemonize */
|
|
if (fork() != 0)
|
|
@@ -128,11 +129,17 @@ int main(void)
|
|
pioh = &ioh->next;
|
|
}
|
|
|
|
+ if (old_connected_disks != connected_disks)
|
|
+ fprintf(stderr, "connected disks: %d => %d\n",
|
|
+ old_connected_disks, connected_disks);
|
|
+
|
|
/* Exit when the last image has been closed */
|
|
- if (old_fd_start != NULL && fd_start == NULL)
|
|
+ if (old_connected_disks != 0 && connected_disks == 0) {
|
|
+ fprintf(stderr, "Last image is closed, exiting.\n");
|
|
exit(0);
|
|
+ }
|
|
|
|
- old_fd_start = fd_start;
|
|
+ old_connected_disks = connected_disks;
|
|
}
|
|
return 0;
|
|
}
|