From cb42a1b1461e02efb034582ac5d8f71534723b92 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@android.com>
Date: Thu, 23 Dec 2010 02:54:08 +0100
Subject: upstream: integrate block changes

This large patch upgrades the block support code to the upstream
version available in ba5e7f82169f32ab8163c707d97c799ca09f8924
dated 2010-08-08

Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
---
 hw/usb-msd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hw/usb-msd.c')

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 3a3eb4a..16e482e 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -551,7 +551,7 @@ USBDevice *usb_msd_init(const char *filename)
     s = qemu_mallocz(sizeof(MSDState));
 
     bdrv = bdrv_new("usb");
-    if (bdrv_open2(bdrv, filename, 0, drv) < 0)
+    if (bdrv_open(bdrv, filename, 0, drv) < 0)
         goto fail;
     s->bs = bdrv;
 
-- 
cgit v1.1