2009-12-10 Felix Zielcke <fzielcke@z-51.de>

	* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Show the disk
	name in an error message.
	(grub_biosdisk_rw): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 573ac3bf0a3fd4562421f35f60c68bfd4d54b1e7..86a2a9d8bb322431b9e4971beaa8a68e0ccfdb49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-10 Felix Zielcke <fzielcke@z-51.de>
+
+       * disk/i386/pc/biosdisk.c (grub_biosdisk_open): Show the disk
+       name in an error message.
+       (grub_biosdisk_rw): Likewise.
+
 2009-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Eliminate NTFS 4Gib barrier.

diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index 0a6137fadeb4b7d3a51f389c15f08bb7ae8733b2..af184b1ba97eb52c4b28b545c93439fa50b91cdb 100644 (file)
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -169,7 +169,7 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
          else
            {
              grub_free (data);
-             return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get C/H/S values");
+             return grub_error (GRUB_ERR_BAD_DEVICE, "%s cannot get C/H/S values", disk->name);
            }
         }
 
@@ -252,7 +252,7 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
          1024 /* cylinders */ *
          256 /* heads */ *
          63 /* spt */)
-       return grub_error (GRUB_ERR_OUT_OF_RANGE, "out of disk");
+       return grub_error (GRUB_ERR_OUT_OF_RANGE, "%s out of disk", disk->name);
 
       soff = ((grub_uint32_t) sector) % data->sectors + 1;
       head = ((grub_uint32_t) sector) / data->sectors;
@@ -260,7 +260,7 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
       coff = head / data->heads;
 
       if (coff >= data->cylinders)
-       return grub_error (GRUB_ERR_OUT_OF_RANGE, "out of disk");
+       return grub_error (GRUB_ERR_OUT_OF_RANGE, "%s out of disk", disk->name);
 
       if (grub_biosdisk_rw_standard (cmd + 0x02, data->drive,
                                     coff, hoff, soff, size, segment))
@@ -268,9 +268,9 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
          switch (cmd)
            {
            case GRUB_BIOSDISK_READ:
-             return grub_error (GRUB_ERR_READ_ERROR, "biosdisk read error");
+             return grub_error (GRUB_ERR_READ_ERROR, "%s read error", disk->name);
            case GRUB_BIOSDISK_WRITE:
-             return grub_error (GRUB_ERR_WRITE_ERROR, "biosdisk write error");
+             return grub_error (GRUB_ERR_WRITE_ERROR, "%s write error", disk->name);
            }
        }
     }