qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 16/23] blockdev: Fix error message for invalid -drive CHS
Date: Mon, 24 Jan 2011 22:10:45 +0100	[thread overview]
Message-ID: <1295903452-18017-17-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1295903452-18017-1-git-send-email-kwolf@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

When cyls, heads or secs are out of range, the error message prints
buf, which points to the value of option "if".  Bogus, may even be
null.  Drop that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 blockdev.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blockdev.c b/blockdev.c
index 662f7a9..28c051b 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -224,15 +224,15 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error)
 
     if (cyls || heads || secs) {
         if (cyls < 1 || (type == IF_IDE && cyls > 16383)) {
-            fprintf(stderr, "qemu: '%s' invalid physical cyls number\n", buf);
+            fprintf(stderr, "qemu: invalid physical cyls number\n");
 	    return NULL;
 	}
         if (heads < 1 || (type == IF_IDE && heads > 16)) {
-            fprintf(stderr, "qemu: '%s' invalid physical heads number\n", buf);
+            fprintf(stderr, "qemu: invalid physical heads number\n");
 	    return NULL;
 	}
         if (secs < 1 || (type == IF_IDE && secs > 63)) {
-            fprintf(stderr, "qemu: '%s' invalid physical secs number\n", buf);
+            fprintf(stderr, "qemu: invalid physical secs number\n");
 	    return NULL;
 	}
     }
-- 
1.7.2.3

  parent reply	other threads:[~2011-01-24 21:10 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-24 21:10 [Qemu-devel] [PULL 00/23] Block patches Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 01/23] qcow2: fix unaligned access Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 02/23] qemu-img snapshot: Use writeback caching Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 03/23] do_snapshot_blkdev() error on missing snapshot_file argument Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 04/23] Make strtosz() return int64_t instead of ssize_t Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 05/23] Avoid divide by zero when there is no block device to migrate Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 06/23] ide: factor dma handling helpers Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 07/23] ide: also reset io_buffer_index for writes Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 08/23] ide: kill ide_dma_submit_check Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 09/23] qcow2: Add QcowCache Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 10/23] qcow2: Use QcowCache Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 11/23] qcow2: Batch flushes for COW Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 12/23] ide: Remove unneeded null pointer check Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 13/23] Documentation: Add qemu-img check/rebase Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 14/23] qed: Refuse to create images on block devices Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 15/23] Fix block migration when the device size is not a multiple of 1 MB Kevin Wolf
2011-01-24 21:10 ` Kevin Wolf [this message]
2011-01-24 21:10 ` [Qemu-devel] [PATCH 17/23] blockdev: Make drive_init() use error_report() Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 18/23] blockdev: Fix drive_del not to crash when drive is not in use Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 19/23] block: Use backing format driver during image creation Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 20/23] scsi-disk: Allow overriding SCSI INQUIRY removable bit Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 21/23] scsi: Allow scsi_bus_legacy_add_drive() to set " Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 22/23] usb-msd: Propagate removable bit to SCSI device Kevin Wolf
2011-01-24 21:10 ` [Qemu-devel] [PATCH 23/23] docs: Document scsi-disk and usb-storage removable parameter Kevin Wolf
2011-01-24 21:54 ` [Qemu-devel] Re: [PULL 00/23] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295903452-18017-17-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).