From: Anthony PERARD <anthony.perard@citrix.com>
To: Paul Durrant <paul.durrant@citrix.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
Stefano Stabellini <sstabellini@kernel.org>,
qemu-block@nongnu.org, qemu-devel@nongnu.org,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
xen-devel@lists.xenproject.org
Subject: Re: [PATCH 10/18] xen: add header and build dataplane/xen-qdisk.c
Date: Mon, 3 Dec 2018 18:09:11 +0000 [thread overview]
Message-ID: <20181203180911.GQ14786__14996.9328231693$1543860541$gmane$org@perard.uk.xensource.com> (raw)
In-Reply-To: <20181121151211.15997-11-paul.durrant@citrix.com>
On Wed, Nov 21, 2018 at 03:12:03PM +0000, Paul Durrant wrote:
> This patch adds the transformations necessary to get dataplane/xen-qdisk.c
> to build against the new XenBus/XenDevice framework. MAINTAINERS is also
> updated due to the introduction of dataplane/xen-qdisk.h.
>
> NOTE: Existing data structure names are retained for the moment. These will
> be modified by subsequent patches. A typedef for XenQdiskDataPlane
> has been added to the header (based on the old struct XenBlkDev name
> for the moment) so that the old names don't need to leak out of the
> dataplane code.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> ---
> diff --git a/hw/block/dataplane/xen-qdisk.c b/hw/block/dataplane/xen-qdisk.c
> index 8e4368e7af..b075aa975d 100644
> --- a/hw/block/dataplane/xen-qdisk.c
> +++ b/hw/block/dataplane/xen-qdisk.c
> @@ -5,65 +5,56 @@
> * Based on original code (c) Gerd Hoffmann <kraxel@redhat.com>
> */
>
> +#include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> +#include "qapi/error.h"
> +#include "hw/hw.h"
> +#include "hw/xen/xen.h"
xen.h isn't needed, xen_common.h should be enough.
> +#include "hw/xen/xen_common.h"
> +#include "hw/block/block.h"
block.h isn't needed, block-backend.h should be enough.
> +#include "hw/block/xen_blkif.h"
> +#include "sysemu/blockdev.h"
blockdev.h doesn't seems to be used.
> +#include "sysemu/block-backend.h"
> +#include "sysemu/iothread.h"
> +#include "xen-qdisk.h"
> +
> @@ -227,20 +219,24 @@ static int ioreq_grant_copy(struct ioreq *ioreq)
> file_blk;
> segs[i].dest.virt = virt;
> }
> - segs[i].len = (ioreq->req.seg[i].last_sect
> - - ioreq->req.seg[i].first_sect + 1) * file_blk;
> + segs[i].len = (ioreq->req.seg[i].last_sect -
> + ioreq->req.seg[i].first_sect + 1) * file_blk;
> virt += segs[i].len;
> }
>
> - rc = xen_be_copy_grant_refs(xendev, to_domain, segs, count);
> + xen_device_copy_grant_refs(xendev, to_domain, segs, count, &local_err);
> +
> + if (local_err) {
> + const char *msg = error_get_pretty(local_err);
> +
> + error_report("failed to copy data: %s", msg);
> + error_free(local_err);
You can do the following instead:
error_prepend(local_err, "failed to copy data: ")
error_report_err(local_err);
> +void xen_qdisk_dataplane_start(struct XenBlkDev *blkdev,
> + const unsigned int ring_ref[],
> + unsigned int nr_ring_ref,
> + unsigned int event_channel,
> + unsigned int protocol)
> {
> - struct XenBlkDev *blkdev = container_of(xendev, struct XenBlkDev, xendev);
> + XenDevice *xendev = blkdev->xendev;
> + unsigned int ring_size;
> + unsigned int i;
>
> - qemu_bh_schedule(blkdev->bh);
> + blkdev->nr_ring_ref = nr_ring_ref;
> + blkdev->ring_ref = g_new(unsigned int, nr_ring_ref);
> +
> + for (i = 0; i < nr_ring_ref; i++) {
> + blkdev->ring_ref[i] = ring_ref[i];
> + }
> +
> + blkdev->protocol = protocol;
> +
> + ring_size = XC_PAGE_SIZE * blkdev->nr_ring_ref;
> + switch (blkdev->protocol) {
> + case BLKIF_PROTOCOL_NATIVE:
> + {
> + blkdev->max_requests = __CONST_RING_SIZE(blkif, ring_size);
> + break;
> + }
> + case BLKIF_PROTOCOL_X86_32:
> + {
> + blkdev->max_requests = __CONST_RING_SIZE(blkif_x86_32, ring_size);
> + break;
> + }
> + case BLKIF_PROTOCOL_X86_64:
> + {
> + blkdev->max_requests = __CONST_RING_SIZE(blkif_x86_64, ring_size);
> + break;
> + }
> + default:
> + assert(false);
> + break;
This should return rather than keep going.
And maybe set an Error that could be added to the parameter of the
function.
> + }
> +
> + xen_device_set_max_grant_refs(xendev, blkdev->nr_ring_ref,
> + &error_fatal);
Do we really want to exit() here if an error happen, rather than let the
caller know? (Same question for other uses of error_fatal.)
> diff --git a/hw/block/dataplane/xen-qdisk.h b/hw/block/dataplane/xen-qdisk.h
> new file mode 100644
> index 0000000000..16bcd500bf
> --- /dev/null
> +++ b/hw/block/dataplane/xen-qdisk.h
> @@ -0,0 +1,25 @@
> +/*
> + * Copyright (c) Citrix Systems Inc.
> + * All rights reserved.
> + */
> +
> +#ifndef HW_BLOCK_DATAPLANE_QDISK_H
> +#define HW_BLOCK_DATAPLANE_QDISK_H
> +
> +#include "hw/xen/xen-bus.h"
> +#include "sysemu/iothread.h"
I would add #include "hw/block/block.h" since it includes the definition
of BlockConf.
> +
> +typedef struct XenBlkDev XenQdiskDataPlane;
> +
> +XenQdiskDataPlane *xen_qdisk_dataplane_create(XenDevice *xendev,
> + BlockConf *conf,
> + IOThread *iothread);
Thanks,
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-12-03 18:09 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181121151211.15997-1-paul.durrant@citrix.com>
2018-11-21 15:11 ` [PATCH 01/18] xen: re-name XenDevice to XenLegacyDevice Paul Durrant
2018-11-28 16:06 ` Anthony PERARD
2018-11-21 15:11 ` [PATCH 02/18] xen: introduce new 'XenBus' and 'XenDevice' object hierarchy Paul Durrant
2018-11-21 15:11 ` [PATCH 03/18] xen: introduce 'xen-qdisk' Paul Durrant
2018-11-21 15:11 ` [PATCH 04/18] xen: create xenstore areas for XenDevice-s Paul Durrant
2018-11-21 15:11 ` [PATCH 05/18] xen: add xenstore watcher infratructure Paul Durrant
2018-11-21 15:11 ` [PATCH 06/18] xen: add grant table interface for XenDevice-s Paul Durrant
2018-12-03 15:45 ` Anthony PERARD
2018-12-05 16:12 ` Paul Durrant
2018-11-21 15:12 ` [PATCH 07/18] xen: add event channel " Paul Durrant
2018-11-21 15:12 ` [PATCH 08/18] xen: duplicate xen_disk.c as basis of dataplane/xen-qdisk.c Paul Durrant
2018-12-03 16:35 ` Anthony PERARD
2018-12-03 16:42 ` Anthony PERARD
2018-11-21 15:12 ` [PATCH 09/18] xen: remove unnecessary code from dataplane/xen-qdisk.c Paul Durrant
2018-12-03 16:58 ` Anthony PERARD
2018-11-21 15:12 ` [PATCH 10/18] xen: add header and build dataplane/xen-qdisk.c Paul Durrant
2018-12-03 18:09 ` Anthony PERARD [this message]
[not found] ` <20181203180911.GQ14786@perard.uk.xensource.com>
2018-12-05 17:31 ` Paul Durrant
2018-11-21 15:12 ` [PATCH 11/18] xen: remove 'XenBlkDev' and 'blkdev' names from dataplane/xen-qdisk Paul Durrant
2018-11-21 15:12 ` [PATCH 12/18] xen: remove 'ioreq' struct/varable/field names from dataplane/xen-qdisk.c Paul Durrant
2018-12-04 11:34 ` Anthony PERARD
2018-11-21 15:12 ` [PATCH 13/18] xen: purge 'blk' and 'ioreq' from function names in dataplane/xen-qdisk.c Paul Durrant
2018-12-04 12:10 ` Anthony PERARD
2018-12-05 17:28 ` Paul Durrant
2018-11-21 15:12 ` [PATCH 14/18] xen: add implementations of xen-qdisk connect and disconnect functions Paul Durrant
2018-11-21 15:12 ` [PATCH 15/18] xen: add a mechanism to automatically create XenDevice-s Paul Durrant
2018-12-04 15:35 ` Anthony PERARD
2018-12-06 12:36 ` Paul Durrant
2018-12-06 15:24 ` Anthony PERARD
[not found] ` <20181206152406.GC18875@perard.uk.xensource.com>
2018-12-06 15:36 ` Paul Durrant
2018-11-21 15:12 ` [PATCH 16/18] xen: automatically create XenQdiskDevice-s Paul Durrant
2018-11-21 15:12 ` [PATCH 17/18] MAINTAINERS: add myself as a Xen maintainer Paul Durrant
2018-11-27 19:05 ` Stefano Stabellini
2018-11-29 14:00 ` [Qemu-devel] " Philippe Mathieu-Daudé
[not found] ` <a247dae0-a766-7f97-c16d-07a32572f35d@redhat.com>
2018-11-29 14:01 ` Paul Durrant
2018-12-04 16:42 ` Anthony PERARD
2018-11-21 15:12 ` [PATCH 18/18] xen: remove the legacy 'xen_disk' backend Paul Durrant
[not found] ` <20181121151211.15997-3-paul.durrant@citrix.com>
2018-11-28 16:19 ` [Qemu-block] [PATCH 02/18] xen: introduce new 'XenBus' and 'XenDevice' object hierarchy Kevin Wolf
[not found] ` <20181128161917.GE4222@dhcp-200-186.str.redhat.com>
2018-11-28 16:26 ` Paul Durrant
2018-11-28 16:28 ` Paul Durrant
2018-11-28 16:28 ` Stefano Stabellini
2018-11-28 16:29 ` Paul Durrant
2018-11-28 16:39 ` Kevin Wolf
2018-11-28 16:45 ` Paul Durrant
[not found] ` <5327ba765089439caf8119de49c3a399@AMSPEX02CL03.citrite.net>
2018-11-28 16:46 ` Paul Durrant
2018-11-29 9:04 ` Kevin Wolf
2018-11-28 17:01 ` [Qemu-devel] " Eric Blake
2018-11-28 17:04 ` Paul Durrant
2018-11-28 17:10 ` Anthony PERARD
2018-11-28 17:17 ` Paul Durrant
2018-11-28 17:32 ` Anthony PERARD
[not found] ` <20181121151211.15997-4-paul.durrant@citrix.com>
2018-11-29 16:05 ` [PATCH 03/18] xen: introduce 'xen-qdisk' Anthony PERARD
[not found] ` <20181129160541.GG14786@perard.uk.xensource.com>
2018-12-04 15:20 ` Paul Durrant
[not found] ` <311937f3c787461686f2ebf68a70a326@AMSPEX02CL03.citrite.net>
2018-12-04 15:49 ` Anthony PERARD
[not found] ` <20181204154908.GX14786@perard.uk.xensource.com>
2018-12-04 15:50 ` Paul Durrant
2018-12-04 17:14 ` Paul Durrant
[not found] ` <20181121151211.15997-5-paul.durrant@citrix.com>
2018-11-29 18:48 ` [PATCH 04/18] xen: create xenstore areas for XenDevice-s Anthony PERARD
[not found] ` <20181129184841.GJ14786@perard.uk.xensource.com>
2018-12-05 12:05 ` Paul Durrant
[not found] ` <589a4488f1ba4e4496775cc06bda291d@AMSPEX02CL03.citrite.net>
2018-12-05 12:43 ` Paul Durrant
[not found] ` <d5bf17f689a34e69b9e3b7b92bcfe4fd@AMSPEX02CL03.citrite.net>
2018-12-05 13:58 ` Anthony PERARD
[not found] ` <20181205135839.GB1259@perard.uk.xensource.com>
2018-12-05 14:24 ` Paul Durrant
2018-12-05 16:28 ` Anthony PERARD
[not found] ` <20181121151211.15997-6-paul.durrant@citrix.com>
2018-12-03 14:42 ` [PATCH 05/18] xen: add xenstore watcher infratructure Anthony PERARD
[not found] ` <20181203144231.GK14786@perard.uk.xensource.com>
2018-12-05 15:24 ` Paul Durrant
[not found] ` <20181121151211.15997-8-paul.durrant@citrix.com>
2018-12-03 16:24 ` [PATCH 07/18] xen: add event channel interface for XenDevice-s Anthony PERARD
2018-12-04 14:24 ` Anthony PERARD
2018-12-05 16:16 ` Paul Durrant
[not found] ` <20181121151211.15997-12-paul.durrant@citrix.com>
2018-12-04 11:05 ` [PATCH 11/18] xen: remove 'XenBlkDev' and 'blkdev' names from dataplane/xen-qdisk Anthony PERARD
[not found] ` <20181121151211.15997-15-paul.durrant@citrix.com>
2018-11-28 16:34 ` [PATCH 14/18] xen: add implementations of xen-qdisk connect and disconnect functions Kevin Wolf
2018-11-28 16:40 ` Paul Durrant
2018-11-29 9:00 ` Kevin Wolf
[not found] ` <20181129090046.GA4797@linux.fritz.box>
2018-11-29 9:33 ` Paul Durrant
[not found] ` <bdee6326dd3041f58202220a50abf9c8@AMSPEX02CL03.citrite.net>
2018-11-29 10:46 ` Kevin Wolf
2018-11-29 10:47 ` Paul Durrant
2018-12-04 12:33 ` Anthony PERARD
[not found] ` <20181204123349.GU14786@perard.uk.xensource.com>
2018-12-06 12:27 ` Paul Durrant
[not found] ` <20181121151211.15997-17-paul.durrant@citrix.com>
2018-12-04 16:40 ` [PATCH 16/18] xen: automatically create XenQdiskDevice-s Anthony PERARD
2018-12-06 13:06 ` Paul Durrant
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20181203180911.GQ14786__14996.9328231693$1543860541$gmane$org@perard.uk.xensource.com' \
--to=anthony.perard@citrix.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=paul.durrant@citrix.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=stefanha@redhat.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).