From patchwork Fri Feb 16 02:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SUuMkhWI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zjHF86SjDz9t3v for ; Fri, 16 Feb 2018 13:30:52 +1100 (AEDT) Received: from localhost ([::1]:57234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVnW-0005R5-Ub for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:30:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmg-0005OO-PH for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmf-0002U8-Oz for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:58 -0500 Received: from mail-vk0-x244.google.com ([2607:f8b0:400c:c05::244]:36208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmf-0002Tw-KN for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:57 -0500 Received: by mail-vk0-x244.google.com with SMTP id m197so1063951vka.3 for ; Thu, 15 Feb 2018 18:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=SUuMkhWI4KST94MuAq1FWOs1Slpw9ffGOO3YOpNcB5ZwLLU2DjQ+Ly7oAKUcA5DAiM LaxH06t5fL2tmnVikI58FC1wgDsX1JtY7pIJkg9m3c5GGGGB177VnND8rfolSsGY2X0v H/u6jYrAJHgtwfzACX4LZP51nuuBRzKq9IpPUKQxNLIb8F70jlzyEszYzkEme9iULP9w VcgSQivONN5WFLNlRobHt0J8DsfpNJjoJtFjzqzJyG1/QzX6m9okz4rB88hyQY7wlsvO vsqEvFuanIpgl8H8/VNmRr/HrL1voZN+yk9tuuPki63UXSmxovJq6R+0otrmF+tr0Pbo oDQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=qcHdyYtDqUC14oLi2MCqSq7M2eGLnWrP3Ehd/ziSsLH1g7YRS/Ad+VoQXYPT1lXTbY uN7ohKl6UoADY18o8ga5sxDH9QHSSbbz/a+u1wX0hAGbzISWPD8WXD7Xi++VS72bgQkR du5xtPqJ1IwMXmYo9pW5w0icPxbnxqlc2jSS1HT9A3MFN7s5cGjJH40W/E466lbobywu blTm2pYxlPwmgC6NZ6TA62eOURCAWw+5HQpVokew83xQTTwxEQfR4OqV9Tk+G5hUhYJS DhFd4B1SnxzAATbq8lOYV+p2ucGKywb/KEWYvF4Z0B9E/zmm+tzOFxZlVPYbN2gDwTS5 LKjA== X-Gm-Message-State: APf1xPAIgtDrKgQx5VwezV0sxiJVXEFV0rQSBkd6oLqpa5jE+gYavO9f NBgIivK0GqVSsNf62w0Z8/M= X-Google-Smtp-Source: AH8x227fwaEJl9wG2ef4sUU43goirpDfw2b83fNVdsehYdGjXkkdQ++/rQ6wtNkToikwlAa14mqNMQ== X-Received: by 10.31.236.195 with SMTP id k186mr3623994vkh.166.1518748197056; Thu, 15 Feb 2018 18:29:57 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:29:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:27 -0300 Message-Id: <20180216022933.10945-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::244 Subject: [Qemu-devel] [PATCH v3 2/7] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Create the SDCard in the realize() function. Suggested-by: Michael Walle Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Acked-by: Michael Walle --- hw/sd/milkymist-memcard.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 1292c0c099..a8e65892c7 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -257,27 +257,31 @@ static void milkymist_memcard_reset(DeviceState *d) device_reset(DEVICE(s->card)); } -static int milkymist_memcard_init(SysBusDevice *dev) +static void milkymist_memcard_init(Object *obj) +{ + MilkymistMemcardState *s = MILKYMIST_MEMCARD(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, + "milkymist-memcard", R_MAX * 4); + sysbus_init_mmio(dev, &s->regs_region); +} + +static void milkymist_memcard_realize(DeviceState *dev, Error **errp) { MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev); - DriveInfo *dinfo; BlockBackend *blk; + DriveInfo *dinfo; /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; s->card = sd_init(blk, false); if (s->card == NULL) { - return -1; + error_setg(errp, "failed to init SD card"); + return; } - s->enabled = blk && blk_is_inserted(blk); - - memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, - "milkymist-memcard", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); - - return 0; } static const VMStateDescription vmstate_milkymist_memcard = { @@ -300,9 +304,8 @@ static const VMStateDescription vmstate_milkymist_memcard = { static void milkymist_memcard_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_memcard_init; + dc->realize = milkymist_memcard_realize; dc->reset = milkymist_memcard_reset; dc->vmsd = &vmstate_milkymist_memcard; /* Reason: init() method uses drive_get_next() */ @@ -313,6 +316,7 @@ static const TypeInfo milkymist_memcard_info = { .name = TYPE_MILKYMIST_MEMCARD, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistMemcardState), + .instance_init = milkymist_memcard_init, .class_init = milkymist_memcard_class_init, };