diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-07-22 16:42:57 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-07-27 14:08:23 -0500 |
| commit | 751c6a17042b5d011013d6963c0505d671cf708e (patch) | |
| tree | 61a769ed1a1c16ebdfc1397ce9d775222dfa8e57 /hw/xen_machine_pv.c | |
| parent | 8a14daa5a1ae22fcfc317f4727a88d6c15c39aae (diff) | |
| download | qemu-751c6a17042b5d011013d6963c0505d671cf708e.zip qemu-751c6a17042b5d011013d6963c0505d671cf708e.tar.gz qemu-751c6a17042b5d011013d6963c0505d671cf708e.tar.bz2 | |
kill drives_table
First step cleaning up the drives handling. This one does nothing but
removing drives_table[], still it became seriously big.
drive_get_index() is gone and is replaced by drives_get() which hands
out DriveInfo pointers instead of a table index. This needs adaption in
*tons* of places all over.
The drives are now maintained as linked list.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xen_machine_pv.c')
| -rw-r--r-- | hw/xen_machine_pv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 6ae5000..162f88d 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -40,7 +40,8 @@ static void xen_init_pv(ram_addr_t ram_size, const char *cpu_model) { CPUState *env; - int i, index; + DriveInfo *dinfo; + int i; /* Initialize a dummy CPU */ if (cpu_model == NULL) { @@ -90,10 +91,10 @@ static void xen_init_pv(ram_addr_t ram_size, /* configure disks */ for (i = 0; i < 16; i++) { - index = drive_get_index(IF_XEN, 0, i); - if (index == -1) + dinfo = drive_get(IF_XEN, 0, i); + if (!dinfo) continue; - xen_config_dev_blk(drives_table + index); + xen_config_dev_blk(dinfo); } /* configure nics */ |