From patchwork Thu Nov 25 07:07:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 73004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D225B70A9 for ; Thu, 25 Nov 2010 18:29:27 +1100 (EST) Received: from localhost ([127.0.0.1]:57613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLWGh-0004bn-R4 for incoming@patchwork.ozlabs.org; Thu, 25 Nov 2010 02:29:23 -0500 Received: from [140.186.70.92] (port=43219 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLVvp-0005cB-RY for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLVvn-0003YU-8W for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:49 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55817 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLVvm-0003Xc-Vw for qemu-devel@nongnu.org; Thu, 25 Nov 2010 02:07:47 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id D575987D82; Thu, 25 Nov 2010 08:07:43 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Thu, 25 Nov 2010 08:07:41 +0100 Message-Id: <1290668862-11695-11-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1290668862-11695-1-git-send-email-agraf@suse.de> References: <1290668862-11695-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Kevin Wolf , Joerg Roedel , Blue Swirl , Gerd Hoffmann , Stefan Hajnoczi , tj@kernel.org, Roland Elek , Sebastian Herbszt Subject: [Qemu-devel] [PATCH 10/11] ahci: spawn controller on demand X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When we add a device using -drive to the guest, we also need to create a new SATA bus to handle the device. This patch adds a function call that every machine that likes to have IF_SATA support can call to get full device creation by keeping the actual qdev code clean. Signed-off-by: Alexander Graf --- v2 -> v3: - redesign v4 -> v5: - redesign to only use qdev in generic parts, get rid of CONFIG_AHCI --- blockdev.c | 35 +++++++++++++++++++++++++++++++++++ blockdev.h | 1 + vl.c | 2 ++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/blockdev.c b/blockdev.c index 5ce90cc..69befb6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -499,6 +499,41 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) return dinfo; } +static void ahci_post_init(void) +{ + int max_bus; + int bus, i; + QemuOpts *opts; + char name[32]; + + max_bus = drive_get_max_bus(IF_SATA); + for (bus = 0; bus <= max_bus; bus++) { + sprintf(name, "ahci-%d", bus); + opts = qemu_opts_create(qemu_find_opts("device"), name, 1); + qemu_opt_set(opts, "driver", "ahci"); + + for (i = 0; i < MAX_SATA_DEVS; i++) { + DriveInfo *dinfo = drive_get(IF_SATA, bus, i); + + if (!dinfo) { + continue; + } + + sprintf(name, "ahci-%d.%d", bus, i); + opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0); + qemu_opt_set(opts, "driver", "ide-drive"); + qemu_opt_set(opts, "unit", "0"); + qemu_opt_set(opts, "bus", name); + qemu_opt_set(opts, "drive", dinfo->id); + } + } +} + +void drive_post_init(void) +{ + ahci_post_init(); +} + void do_commit(Monitor *mon, const QDict *qdict) { const char *device = qdict_get_str(qdict, "device"); diff --git a/blockdev.h b/blockdev.h index f50a15e..6db229a 100644 --- a/blockdev.h +++ b/blockdev.h @@ -42,6 +42,7 @@ DriveInfo *drive_get_by_blockdev(BlockDriverState *bs); QemuOpts *drive_add(const char *file, const char *fmt, ...) GCC_FMT_ATTR(2, 3); DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi, int *fatal_error); +void drive_post_init(void); /* device-hotplug */ diff --git a/vl.c b/vl.c index c58583d..1903040 100644 --- a/vl.c +++ b/vl.c @@ -2795,6 +2795,8 @@ int main(int argc, char **argv, char **envp) if (qemu_opts_foreach(qemu_find_opts("drive"), drive_init_func, &machine->use_scsi, 1) != 0) exit(1); + drive_post_init(); + register_savevm_live(NULL, "ram", 0, 4, NULL, ram_save_live, NULL, ram_load, NULL);