From 596509339206d51742365be57da2f0038e4da56e Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 3 Sep 2009 13:43:54 -0300
Subject: [PATCH] Remove initrd warning message

Message-id: <20090720104240.GB9121@amd.home.annexia.org>
RH-Author: Richard Jones <rjones@redhat.com>
Patchwork-id: 2974
O-Subject: [KVM PATCH RHEL 5.5] Remove initrd warning message
Bugzilla: 512672
CVE:
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
RH-Acked-by: Glauber Costa <glommer@redhat.com>
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
RH-Acked-by: Don Dutile <ddutile@redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=512672

The attached very trivial patch removes an annoying warning message
which is printed by qemu whenever the qemu -initrd option is used.
Since libguestfs uses this option, the message is always printed for
us.

Upstream since May 2009:

http://git.savannah.gnu.org/cgit/qemu.git/commit/?id=42fa1c2e226bd62e8df145f3509b692b65a6170c

The attached patch is the same as upstream, just rebased against our
RHEL 5.4 Beta KVM package.

I tested it using libguestfs.  It suppresses the message as expected.

Rich.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/pc.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index f87fa22..c6822c2 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -663,9 +663,6 @@ static void load_linux(uint8_t *option_rom,
 	initrd_size = get_file_size(fi);
 	initrd_addr = (initrd_max-initrd_size) & ~4095;
 
-        fprintf(stderr, "qemu: loading initrd (%#x bytes) at 0x" TARGET_FMT_plx
-                "\n", initrd_size, initrd_addr);
-
 	if (!fread_targphys_ok(initrd_addr, initrd_size, fi)) {
 	    fprintf(stderr, "qemu: read error on initial ram disk '%s'\n",
 		    initrd_filename);
-- 
1.6.3.rc4.29.g8146