From d43ee6a87c09cff29bbeff19a897d2982b3ac434 Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Wed, 9 Mar 2005 18:26:32 +0000 Subject: [PATCH] bitkeeper revision 1.1236.19.1 (422f3fd8BustMuUXTkjmPaBu2yss5Q) Fix ctrl_iface recovery across suspend/resume. Signed-off-by: ian@xensource.com --- linux-2.6.10-xen-sparse/arch/xen/kernel/ctrl_if.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linux-2.6.10-xen-sparse/arch/xen/kernel/ctrl_if.c b/linux-2.6.10-xen-sparse/arch/xen/kernel/ctrl_if.c index 5b38ba59cb..81d3f36fd0 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/kernel/ctrl_if.c +++ b/linux-2.6.10-xen-sparse/arch/xen/kernel/ctrl_if.c @@ -481,6 +481,8 @@ void ctrl_if_suspend(void) void ctrl_if_resume(void) { + control_if_t *ctrl_if = get_ctrl_if(); + if ( xen_start_info.flags & SIF_INITDOMAIN ) { /* @@ -501,8 +503,8 @@ void ctrl_if_resume(void) } /* Sync up with shared indexes. */ - RING_DROP_PENDING_RESPONSES(&ctrl_if_tx_ring); - RING_DROP_PENDING_REQUESTS(&ctrl_if_rx_ring); + FRONT_RING_ATTACH(&ctrl_if_tx_ring, &ctrl_if->tx_ring); + BACK_RING_ATTACH(&ctrl_if_rx_ring, &ctrl_if->rx_ring); ctrl_if_evtchn = xen_start_info.domain_controller_evtchn; ctrl_if_irq = bind_evtchn_to_irq(ctrl_if_evtchn); -- 2.39.5