From patchwork Thu Apr 5 15:48:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 151226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28C38B703F for ; Sat, 7 Apr 2012 03:42:17 +1000 (EST) Received: from localhost ([::1]:47829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFowd-0003nw-8c for incoming@patchwork.ozlabs.org; Thu, 05 Apr 2012 11:49:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFovj-0001e6-00 for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:49:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SFovd-0006kC-CO for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:48:58 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:40630) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SFovd-0006jH-78 for qemu-devel@nongnu.org; Thu, 05 Apr 2012 11:48:53 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt2 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M2000NCPJX00J80@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 05 Apr 2012 16:48:36 +0100 (BST) Received: from dodo.rnd.samsung.ru ([106.109.8.162]) by spt2.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M2000IDGJWVHW@spt2.w1.samsung.com> for qemu-devel@nongnu.org; Thu, 05 Apr 2012 16:48:50 +0100 (BST) Date: Thu, 05 Apr 2012 19:48:33 +0400 From: Igor Mitsyanko In-reply-to: <1333640913-16028-1-git-send-email-i.mitsyanko@samsung.com> To: qemu-devel@nongnu.org Message-id: <1333640913-16028-11-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1333640913-16028-1-git-send-email-i.mitsyanko@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.13 Cc: peter.maydell@linaro.org, Igor Mitsyanko , quintela@redhat.com, kyungmin.park@samsung.com, michael@walle.cc, paul@codesourcery.com, afaerber@suse.de, d.solodkiy@samsung.com Subject: [Qemu-devel] [PATCH V2 10/10] hw/sd.c: introduce SD card "image" property and allow SD hot-insert X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org New SD card "image" property can be used to: - change image file attached to virtual SD card - hot-insert new image file into newly initialized BlockDriverState (this was not possible before). Example usage: ./qom-set /machine/milkymist/milkymist-memcard/card.image /home/me/mynewcard.img this will attach image file /home/me/mynewcard.img to virtual SD card connected to milkymist-memcard host controller device. If virtual card was already attached to some other image file, eject event is triggered before attaching new file. Signed-off-by: Igor Mitsyanko --- hw/sd.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index 8ffaa17..3e75405 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -1816,6 +1816,48 @@ static void sd_set_spimode(Object *obj, Visitor *v, void *opaque, } } +static void sd_set_image_path(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + SDState *sd = SD_CARD(obj); + char *new_image; + + visit_type_str(v, &new_image, "file", errp); + + if (error_is_set(errp)) { + return; + } + + if (sd->bdrv) { + qmp_change_blockdev(bdrv_get_device_name(sd->bdrv), new_image, + false, NULL, errp); + } else { + DriveInfo *di; + QemuOpts *opts = drive_add(IF_SD, sd->if_idx, new_image, ""); + + if (!opts) { + error_set(errp, QERR_OPEN_FILE_FAILED, new_image); + return; + } + + di = drive_init(opts, 0); + if (!di) { + error_set(errp, QERR_OPEN_FILE_FAILED, new_image); + return; + } + + sd_reset(sd, di->bdrv); + if (bdrv_attach_dev(sd->bdrv, sd) < 0) { + drive_put_ref(di); + error_set(errp, QERR_OPEN_FILE_FAILED, new_image); + return; + } + bdrv_set_dev_ops(sd->bdrv, &sd_block_ops, sd); + qemu_set_irq(sd->inserted_cb, bdrv_is_inserted(sd->bdrv)); + qemu_set_irq(sd->readonly_cb, sd->wp_switch); + } +} + static void sd_initfn(Object *obj) { SDState *sd = SD_CARD(obj); @@ -1826,6 +1868,8 @@ static void sd_initfn(Object *obj) NULL, NULL, NULL); object_property_add(obj, "spi-mode", "boolean", sd_is_spi, sd_set_spimode, NULL, NULL, NULL); + object_property_add(OBJECT(sd), "image", "string", + NULL, sd_set_image_path, NULL, NULL, NULL); } static TypeInfo sd_type_info = {