[Xen-changelog] [xen-3.1-testing] ioemu: cache the BlockDriverState pointer

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201186377 0
# Node ID 328d7abb2a1f21bf052ff44787bcf834af1726e8
# Parent  89b51e83577169bda9f7db8bfb9c63a04e19672f
ioemu: cache the BlockDriverState pointer
This actually fixes a bug in the scsi case.

Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
xen-unstable changeset:   16863:6496ad18c3e286d03dc5f3b80588d06deec7c39f
xen-unstable date:        Wed Jan 23 18:02:48 2008 +0000
---
 tools/ioemu/xenstore.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r 89b51e835771 -r 328d7abb2a1f tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c    Tue Jan 22 11:33:40 2008 +0000
+++ b/tools/ioemu/xenstore.c    Thu Jan 24 14:52:57 2008 +0000
@@ -85,6 +85,7 @@ void xenstore_parse_domain_config(int do
         *dev = NULL, *params = NULL, *type = NULL;
     int i, is_scsi;
     unsigned int len, num, hd_index;
+    BlockDriverState *bs;
 
     for(i = 0; i < MAX_DISKS + MAX_SCSI_DISKS; i++)
         media_filename[i] = NULL;
@@ -164,17 +165,17 @@ void xenstore_parse_domain_config(int do
             }
         }
 
-        bs_table[hd_index + (is_scsi ? MAX_DISKS : 0)] = bdrv_new(dev);
+        bs = bs_table[hd_index + (is_scsi ? MAX_DISKS : 0)] = bdrv_new(dev);
         /* check if it is a cdrom */
         if (type && !strcmp(type, "cdrom")) {
-            bdrv_set_type_hint(bs_table[hd_index], BDRV_TYPE_CDROM);
+            bdrv_set_type_hint(bs, BDRV_TYPE_CDROM);
             if (pasprintf(&buf, "%s/params", bpath) != -1)
                 xs_watch(xsh, buf, dev);
         }
+
         /* open device now if media present */
         if (params[0]) {
-            if (bdrv_open(bs_table[hd_index + (is_scsi ? MAX_DISKS : 0)],
-                          params, 0 /* snapshot */) < 0)
+            if (bdrv_open(bs, params, 0 /* snapshot */) < 0)
                 fprintf(stderr, "qemu: could not open hard disk image '%s'\n",
                         params);
         }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog