| Message ID | 1478532721-20160-2-git-send-email-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/07/2016 10:32 AM, Roger Pau Monne wrote: > Or else ACPI data is always copied at the start of the page pointed by > guest_addr_out, ignoring the page offset. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-and-Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
On 07/11/16 15:32, Roger Pau Monne wrote: > Or else ACPI data is always copied at the start of the page pointed by > guest_addr_out, ignoring the page offset. > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > --- > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > Cc: Wei Liu <wei.liu2@citrix.com> > Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> > Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index e177667..ad819dd 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -1090,8 +1090,9 @@ static int xc_dom_load_acpi(struct xc_dom_image *dom) dom->acpi_modules[i].length, dom->acpi_modules[i].guest_addr_out); - num_pages = (dom->acpi_modules[i].length + (XC_PAGE_SIZE - 1)) >> - XC_PAGE_SHIFT; + num_pages = (dom->acpi_modules[i].length + + (dom->acpi_modules[i].guest_addr_out & ~XC_PAGE_MASK) + + (XC_PAGE_SIZE - 1)) >> XC_PAGE_SHIFT; extents = malloc(num_pages * sizeof(*extents)); if ( !extents ) { @@ -1118,6 +1119,9 @@ static int xc_dom_load_acpi(struct xc_dom_image *dom) goto err; } + ptr = (uint8_t *)ptr + + (dom->acpi_modules[i].guest_addr_out & ~XC_PAGE_MASK); + memcpy(ptr, dom->acpi_modules[i].data, dom->acpi_modules[i].length); munmap(ptr, XC_PAGE_SIZE * num_pages);
Or else ACPI data is always copied at the start of the page pointed by guest_addr_out, ignoring the page offset. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- Changes since v1: - Also fix the calculation of the required number of pages so that the offset is taken into account. --- tools/libxc/xc_dom_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)