CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed Nov 30 01:36:38 UTC 2016

Modified Files:
        src/sys/dev/pci: ld_virtio.c viornd.c

Log Message:
Don't call virtio_enqueue_abort when virtio_enqueue_reserve fails.
Pointed out by uwe@


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/ld_virtio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/viornd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/ld_virtio.c
diff -u src/sys/dev/pci/ld_virtio.c:1.12 src/sys/dev/pci/ld_virtio.c:1.13
--- src/sys/dev/pci/ld_virtio.c:1.12	Mon Sep 26 23:33:32 2016
+++ src/sys/dev/pci/ld_virtio.c	Tue Nov 29 20:36:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ld_virtio.c,v 1.12 2016/09/27 03:33:32 pgoyette Exp $	*/
+/*	$NetBSD: ld_virtio.c,v 1.13 2016/11/30 01:36:38 christos Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.12 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.13 2016/11/30 01:36:38 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -399,7 +399,6 @@ ld_virtio_start(struct ld_softc *ld, str
 	r = virtio_enqueue_reserve(vsc, vq, slot, vr->vr_payload->dm_nsegs +
 	    VIRTIO_BLK_MIN_SEGMENTS);
 	if (r != 0) {
-		virtio_enqueue_abort(vsc, vq, slot);
 		bus_dmamap_unload(vsc->sc_dmat, vr->vr_payload);
 		return r;
 	}

Index: src/sys/dev/pci/viornd.c
diff -u src/sys/dev/pci/viornd.c:1.9 src/sys/dev/pci/viornd.c:1.10
--- src/sys/dev/pci/viornd.c:1.9	Tue Oct 27 12:04:19 2015
+++ src/sys/dev/pci/viornd.c	Tue Nov 29 20:36:38 2016
@@ -1,4 +1,4 @@
-/* 	$NetBSD: viornd.c,v 1.9 2015/10/27 16:04:19 christos Exp $ */
+/* 	$NetBSD: viornd.c,v 1.10 2016/11/30 01:36:38 christos Exp $ */
 /*	$OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $	*/
 
 /*
@@ -107,7 +107,6 @@ viornd_get(size_t bytes, void *priv)
 		goto out;
 	}
         if (virtio_enqueue_reserve(vsc, vq, slot, 1)) {
-		virtio_enqueue_abort(vsc, vq, slot);
 		goto out;
 	}
         virtio_enqueue(vsc, vq, slot, sc->sc_dmamap, 0);