Re: [PATCH pvops] Fix a bug that shutdown watcher is disabled on pvops

[Frank Pan <frankpzh@gmail.com>]

Branch devel/next-2.6.38 on your tree has no such issue.
In this branch, setup_shutdown_watcher will be called inside
xen_setup_shutdown_event.(on PV-on-HVM)

On Fri, Mar 4, 2011 at 2:29 AM, Konrad Rzeszutek Wilk
<konrad.wilk@oracle.com> wrote:
> On Fri, Mar 04, 2011 at 12:46:20AM +0800, Frank Pan wrote:
>> I use pvops kernel for HVM domU, and I find that shutdown watcher is
>
> Which one? 2.6.32? stock 2.6.37? devel 2.6.38?
>> not enabled at all when I compile platform-pci module inside kernel.
>> The code related calls xen_setup_shutdown_event after xenbus_probe,
>> that makes setup_shutdown_watcher never called.
>>
>> The following patch fixes this by changing the order of xenbus_probe
>> and xen_setup_shutdown, which makes my PV-on-HVM domU responses well
>> for the "control/shutdown" entry.
>>
>> ---
>>  linux-2.6-xen/drivers/xen/platform-pci.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/linux-2.6-xen/drivers/xen/platform-pci.c
>> b/linux-2.6-xen/drivers/xen/platform-pci.c
>> index c01b5dd..f141cfe 100644
>> --- a/linux-2.6-xen/drivers/xen/platform-pci.c
>> +++ b/linux-2.6-xen/drivers/xen/platform-pci.c
>> @@ -162,10 +162,10 @@ static int __devinit platform_pci_init(struct
>> pci_dev *pdev,
>>       ret = gnttab_init();
>>       if (ret)
>>               goto out;
>> -     xenbus_probe(NULL);
>>       ret = xen_setup_shutdown_event();
>>       if (ret)
>>               goto out;
>> +     xenbus_probe(NULL);
>>       return 0;
>>
>>  out:
>> --
>> 1.7.0.4
>>
>> --
>> Frank Pan
>>
>> Computer Science and Technology
>> Tsinghua University
>
>> From 8d2402bd48ccc9eb5afe2aaa407d61ff715cb24c Mon Sep 17 00:00:00 2001
>> From: Frank Pan <frankpzh@gmail.com>
>> Date: Thu, 3 Mar 2011 16:36:17 +0000
>> Subject: [PATCH] Fix a bug that shutdown watcher is disabled on pvops
>>
>> ---
>>  linux-2.6-xen/drivers/xen/platform-pci.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/linux-2.6-xen/drivers/xen/platform-pci.c b/linux-2.6-xen/drivers/xen/platform-pci.c
>> index c01b5dd..f141cfe 100644
>> --- a/linux-2.6-xen/drivers/xen/platform-pci.c
>> +++ b/linux-2.6-xen/drivers/xen/platform-pci.c
>> @@ -162,10 +162,10 @@ static int __devinit platform_pci_init(struct pci_dev *pdev,
>>       ret = gnttab_init();
>>       if (ret)
>>               goto out;
>> -     xenbus_probe(NULL);
>>       ret = xen_setup_shutdown_event();
>>       if (ret)
>>               goto out;
>> +     xenbus_probe(NULL);
>>       return 0;
>>
>>  out:
>> --
>> 1.7.0.4
>>
>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xensource.com
>> http://lists.xensource.com/xen-devel
>
>



-- 
潘震皓, Frank Pan

Computer Science and Technology
Tsinghua University