From 6837d24e15e9791b481da71a9502425b2d2f2bed Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Tue, 12 May 2009 16:04:40 -0300
Subject: [PATCH] Disable virtio-balloon (bz#500453)

It causes problems on suspend on some guests, and it is not used on RHEV
anyway.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 503811
RH-Upstream-status: not-applicable
Message-ID: <20090512190440.GT4871@blackpad>
Acked-by: Dor Laor <dlaor@redhat.com>
Acked-by: "Michael S. Tsirkin" <mst@redhat.com>
Acked-by: john cooper <john.cooper@redhat.com>
---
 qemu/Makefile.target |    6 +++---
 qemu/hw/pc.c         |    5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index de7ecac..28384d0 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -613,7 +613,7 @@ ifndef CONFIG_USER_ONLY
 OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
-OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
+OBJS+=virtio.o virtio-blk.o virtio-net.o
 OBJS+=fw_cfg.o
 ifdef CONFIG_KVM
 OBJS+=kvm.o kvm-all.o
@@ -718,7 +718,7 @@ OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o smbios.o
 OBJS+= extboot.o
 # virtio support
-OBJS+= virtio.o virtio-blk.o virtio-balloon.o
+OBJS+= virtio.o virtio-blk.o
 OBJS += virtio-net.o
 
 ifeq ($(CONFIG_QXL),yes)
@@ -740,7 +740,7 @@ OBJS+= fdc.o mc146818rtc.o serial.o i8259.o ipf.o
 OBJS+= cirrus_vga.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o smbus_eeprom.o
 # virtio support
-OBJS+= virtio.o virtio-blk.o virtio-balloon.o
+OBJS+= virtio.o virtio-blk.o
 OBJS+= virtio-net.o
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 0d70856..48476ff 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -34,7 +34,6 @@
 #include "console.h"
 #include "fw_cfg.h"
 #include "virtio-blk.h"
-#include "virtio-balloon.h"
 #include "hpet_emul.h"
 #include "device-assignment.h"
 #include "smbios.h"
@@ -1202,10 +1201,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
 	extboot_init(info->bdrv, 1);
     }
 
-    /* Add virtio balloon device */
-    if (pci_enabled)
-        virtio_balloon_init(pci_bus);
-
 #ifdef USE_KVM_DEVICE_ASSIGNMENT
     if (kvm_enabled()) {
         add_assigned_devices(pci_bus, assigned_devices, assigned_devices_index);
-- 
1.6.3.rc4.29.g8146