Patchwork [10/11] ahci: spawn controller on demand

login
register
mail settings
Submitter Alexander Graf
Date Nov. 25, 2010, 7:07 a.m.
Message ID <1290668862-11695-11-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/73004/
State New
Headers show

Comments

Alexander Graf - Nov. 25, 2010, 7:07 a.m.
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 <agraf@suse.de>

---

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(-)
Blue Swirl - Nov. 26, 2010, 6:21 p.m.
On Thu, Nov 25, 2010 at 7:07 AM, Alexander Graf <agraf@suse.de> wrote:
> 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 <agraf@suse.de>
>
> ---
>
> 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);

Please use
snprintf(name, sizeof(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);

snprintf(name, sizeof(name), "ahci-%d.%d", bus, i);

Patch

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);