1.1 --- a/xen/arch/x86/platform_hypercall.c	Wed Jun 20 19:24:08 2007 +0100
     1.2 +++ b/xen/arch/x86/platform_hypercall.c	Wed Jun 20 19:31:37 2007 +0100
     1.3 @@ -227,17 +227,17 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
     1.4              if ( *(u32 *)bootsym(boot_edid_info) == 0x13131313 )
     1.5                  break;
     1.6  
     1.7 -            op->u.firmware_info.u.ddc_info.capabilities =
     1.8 +            op->u.firmware_info.u.vbeddc_info.capabilities =
     1.9                  bootsym(boot_edid_caps);
    1.10 -            op->u.firmware_info.u.ddc_info.edid_transfer_time =
    1.11 +            op->u.firmware_info.u.vbeddc_info.edid_transfer_time =
    1.12                  bootsym(boot_edid_caps) >> 8;
    1.13  
    1.14              ret = 0;
    1.15              if ( copy_field_to_guest(u_xenpf_op, op, u.firmware_info.
    1.16 -                                     u.ddc_info.capabilities) ||
    1.17 +                                     u.vbeddc_info.capabilities) ||
    1.18                   copy_field_to_guest(u_xenpf_op, op, u.firmware_info.
    1.19 -                                     u.ddc_info.edid_transfer_time) ||
    1.20 -                 copy_to_compat(op->u.firmware_info.u.ddc_info.edid,
    1.21 +                                     u.vbeddc_info.edid_transfer_time) ||
    1.22 +                 copy_to_compat(op->u.firmware_info.u.vbeddc_info.edid,
    1.23                                  bootsym(boot_edid_info), 128) )
    1.24                  ret = -EFAULT;
    1.25              break;

     2.1 --- a/xen/include/public/platform.h	Wed Jun 20 19:24:08 2007 +0100
     2.2 +++ b/xen/include/public/platform.h	Wed Jun 20 19:31:37 2007 +0100
     2.3 @@ -147,7 +147,7 @@ struct xenpf_firmware_info {
     2.4              uint8_t edid_transfer_time;
     2.5              /* must refer to 128-byte buffer */
     2.6              XEN_GUEST_HANDLE(uint8_t) edid;
     2.7 -        } ddc_info; /* XEN_FW_VBEDDC_INFO */
     2.8 +        } vbeddc_info; /* XEN_FW_VBEDDC_INFO */
     2.9      } u;
    2.10  };
    2.11  typedef struct xenpf_firmware_info xenpf_firmware_info_t;