[Xen-devel] Re: [PATCH] fix pv-on-hvm for ia64

[DOI Tsunehisa <Doi.Tsunehisa@xxxxxxxxxxxxxx>]

Doi.Tsunehisa@xxxxxxxxxxxxxx wrote:
> You (keir) said:
>>>    It looks like 3.0.4 had been tagged, so I assume any updates need to
>>> come in via patches now.  We have one final patch for ia64 which fixes
>>> PV-on-HVM driver support for ia64.  If there's still time for a last
>>> minute patch, please consider adding this one to the xen-3.0.4-testing
>>> tree.  The patch is below.  Thanks,
>> It missed 3.0.4 so you may as well apply it to xen-ia64-unstable.hg. I
>> suggest renaming the macro HVM_PARAM_CALLBACK_IRQ_RID since it isn't a
>> member of the HVM_PARAM enumeration.
> 
>   I think that it should be renamed to IA64_CALLBACK_IRQ_RID.
> 
>   What do you think about this ?

  I made the renaming patch.

Thanks,
- Tsunehisa Doi

# HG changeset patch
# User Doi.Tsunehisa@xxxxxxxxxxxxxx
# Node ID 65ef70f0e1e878d536abe6a56198491877bde9a4
# Parent  cd7ee537b73a32b25c2145da7147b1b27d1128e1
Rename RID maker HVM_PARAM_CALLBACK_IRQ_RID to IA64_CALLBACK_IRQ_RID

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>

diff -r cd7ee537b73a -r 65ef70f0e1e8 
unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Thu Dec 21 
15:25:14 2006 +0900
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c  Fri Dec 22 
09:03:25 2006 +0900
@@ -192,7 +192,7 @@ static int get_callback_irq(struct pci_d
        rid = ((pdev->bus->number & 0xff) << 8) | pdev->devfn;
        printk(KERN_INFO DRV_NAME ":use Requester-ID(%04x) as callback irq\n",
               rid);
-       return rid | HVM_PARAM_CALLBACK_IRQ_RID;
+       return rid | IA64_CALLBACK_IRQ_RID;
 #else /* !__ia64__ */
        return pdev->irq;
 #endif
diff -r cd7ee537b73a -r 65ef70f0e1e8 xen/arch/ia64/vmx/vmx_process.c
--- a/xen/arch/ia64/vmx/vmx_process.c   Thu Dec 21 15:25:14 2006 +0900
+++ b/xen/arch/ia64/vmx/vmx_process.c   Fri Dec 22 09:03:25 2006 +0900
@@ -212,7 +212,7 @@ void leave_hypervisor_tail(struct pt_reg
             if (callback_irq != 0 && local_events_need_delivery()) {
                 /* change level for para-device callback irq */
                 /* use level irq to send discrete event */
-                if (callback_irq & HVM_PARAM_CALLBACK_IRQ_RID) {
+                if (callback_irq & IA64_CALLBACK_IRQ_RID) {
                     /* case of using Requester-ID as callback irq */
                     /* RID: '<#bus(8)><#dev(5)><#func(3)>' */
                     int dev = (callback_irq >> 3) & 0x1f;
diff -r cd7ee537b73a -r 65ef70f0e1e8 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h    Thu Dec 21 15:25:14 2006 +0900
+++ b/xen/include/public/arch-ia64.h    Fri Dec 22 09:03:25 2006 +0900
@@ -64,7 +64,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
 
 /* Arch specific callback irq definition */
 /* using Requester-ID(RID) as callback irq */
-#define HVM_PARAM_CALLBACK_IRQ_RID        (1 << 31)
+#define IA64_CALLBACK_IRQ_RID        (1 << 31)
 
 /* Maximum number of virtual CPUs in multi-processor guests. */
 /* WARNING: before changing this, check that shared_info fits on a page */

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel