aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 10:34:22 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:46:58 -0500
commit382f074371f7dc32a34c944c845b1698e83d8c36 (patch)
treef05fad2d2e592ad2eaa2fa0fd58eb64e86eea7a4 /hw/pc.c
parent59f2a78793b6d17634f39646d604e84af51e0919 (diff)
switch balloon initialization to -device.
With that patch applied "-balloon virtio,args" becomes a shortcut for "-device virtio-balloon-pci,args". Side effects: - ballon device gains support for id=<tag>. - ballon device is off by default now. - initialization order changes, which may in different pci slot assignment depending on the VM configuration. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 77ad8a1084..32713b452a 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1123,7 +1123,6 @@ static void pc_init1(ram_addr_t ram_size,
ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
int bios_size, isa_bios_size, oprom_area_size;
PCIBus *pci_bus;
- PCIDevice *pci_dev;
ISADevice *isa_dev;
int piix3_devfn = -1;
CPUState *env;
@@ -1423,12 +1422,6 @@ static void pc_init1(ram_addr_t ram_size,
}
}
- /* Add virtio balloon device */
- if (pci_enabled && virtio_balloon) {
- pci_dev = pci_create("virtio-balloon-pci", virtio_balloon_devaddr);
- qdev_init(&pci_dev->qdev);
- }
-
/* Add virtio console devices */
if (pci_enabled) {
for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {