On Mon, Dec 17, 2018 at 11:40:39AM +0000, Paul Durrant wrote: > Not all of the code duplicated from xen_disk.c is required as the basis for > the new dataplane implementation so this patch removes extraneous code, > along with the legacy #includes and calls to the legacy xen_pv_printf() > function. Error messages are changed to be reported using error_report(). > > NOTE: The code is still not yet built. Further transformations will be > required to make it correctly interface to the new XenBus/XenDevice > framework. They will be delivered in a subsequent patch. > > Signed-off-by: Paul Durrant <paul.durr...@citrix.com> > Acked-by: Anthony Perard <anthony.per...@citrix.com> > --- > Cc: Stefano Stabellini <sstabell...@kernel.org> > Cc: Stefan Hajnoczi <stefa...@redhat.com> > Cc: Kevin Wolf <kw...@redhat.com> > Cc: Max Reitz <mre...@redhat.com> > > v2: > - Leave existing boilerplate alone, other than removing the now-incorrect > description > --- > hw/block/dataplane/xen-block.c | 409 > ++--------------------------------------- > 1 file changed, 16 insertions(+), 393 deletions(-) > > diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c > index 9fae505..98f987d 100644 > --- a/hw/block/dataplane/xen-block.c > +++ b/hw/block/dataplane/xen-block.c > @@ -1,6 +1,4 @@ > /* > - * xen paravirt block device backend > - * > * (c) Gerd Hoffmann <kra...@redhat.com> > * > * This program is free software; you can redistribute it and/or modify > @@ -19,26 +17,12 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#include "qemu/osdep.h" > -#include "qemu/units.h" > -#include <sys/ioctl.h> > -#include <sys/uio.h> > - > -#include "hw/hw.h" > -#include "hw/xen/xen_backend.h" > -#include "xen_blkif.h" > -#include "sysemu/blockdev.h" > -#include "sysemu/iothread.h" > -#include "sysemu/block-backend.h" > -#include "qapi/error.h" > -#include "qapi/qmp/qdict.h" > -#include "qapi/qmp/qstring.h" > -#include "trace.h" > - > -/* ------------------------------------------------------------- */ > - > -#define BLOCK_SIZE 512 > -#define IOCB_COUNT (BLKIF_MAX_SEGMENTS_PER_REQUEST + 2) > +/* > + * Copyright (c) 2018 Citrix Systems Inc. > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */
This patch obviously comes from v3 of the patch series. v4 was fine. Please check comments on v1 v2 and v3. Thanks, -- Anthony PERARD
