From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47955)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <olaf@aepfle.de>) id 1WGYFA-0001EY-50
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 13:21:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <olaf@aepfle.de>) id 1WGYF6-0002Zl-Jo
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 13:21:08 -0500
Received: from mo6-p00-ob.smtp.rzone.de ([2a01:238:20a:202:5300::3]:17003)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <olaf@aepfle.de>) id 1WGYF6-0002ZP-CY
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 13:21:04 -0500
Date: Thu, 20 Feb 2014 19:20:58 +0100
From: Olaf Hering <olaf@aepfle.de>
Message-ID: <20140220182057.GB19843@aepfle.de>
References: <1391702379-20042-1-git-send-email-olaf@aepfle.de>
	<alpine.DEB.2.02.1402201803290.15812@kaball.uk.xensource.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.02.1402201803290.15812@kaball.uk.xensource.com>
Subject: Re: [Qemu-devel] [PATCH v2] xen_disk: add discard support
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com

On Thu, Feb 20, Stefano Stabellini wrote:

> On Thu, 6 Feb 2014, Olaf Hering wrote:
> > @@ -253,6 +254,8 @@ static int ioreq_parse(struct ioreq *ioreq)
> >      case BLKIF_OP_WRITE:
> >          ioreq->prot = PROT_READ; /* from memory */
> >          break;
> > +    case BLKIF_OP_DISCARD:
> > +        return 0;
> >      default:
> >          xen_be_printf(&blkdev->xendev, 0, "error: unknown operation (%d)\n",
> >                        ioreq->req.operation);
> 
> Unfortunately I didn't realize before that older Xen releases don't
> define BLKIF_OP_DISCARD, therefore this patch would cause QEMU build
> failures against Xen 4.1 for example.

Would that work for you?

Olaf

diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 2d5a25b..4ca03ff 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -144,6 +144,9 @@ static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
 {
     return -ENOSYS;
 }
+#ifndef BLKIF_OP_DISCARD
+#define BLKIF_OP_DISCARD 5
+#endif
 #else
 static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
         uint64_t addr, uint32_t data)