mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
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>
This commit is contained in:
parent
59f2a78793
commit
382f074371
3 changed files with 19 additions and 26 deletions
7
hw/pc.c
7
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++) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue