sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

Virtio-balloon qdev conversion 

Signed-off-by: Paul Brook <paul@codesourcery.com>
This commit is contained in:
Paul Brook 2009-05-14 22:35:08 +01:00
parent 07e3af9ac3
commit 2d72c5727f
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/pc.c
View File

@ -33,7 +33,6 @@
#include "boards.h"
#include "monitor.h"
#include "fw_cfg.h"
#include "virtio-balloon.h"
#include "virtio-console.h"
#include "hpet_emul.h"
#include "watchdog.h"
@ -1141,8 +1140,9 @@ static void pc_init1(ram_addr_t ram_size,
}
/* Add virtio balloon device */
if (pci_enabled)
virtio_balloon_init(pci_bus);
if (pci_enabled) {
pci_create_simple(pci_bus, -1, "virtio-balloon");
}
/* Add virtio console devices */
if (pci_enabled) {

20
hw/virtio-balloon.c
View File

@ -169,17 +169,11 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
void *virtio_balloon_init(PCIBus *bus)
static void virtio_balloon_init(PCIDevice *pci_dev)
{
VirtIOBalloon *s;
PCIDevice *d;
d = pci_register_device(bus, "virtio-balloon", sizeof(VirtIOBalloon),
-1, NULL, NULL);
if (!d)
return NULL;
s = (VirtIOBalloon *)virtio_init_pci(d, "virtio-balloon",
s = (VirtIOBalloon *)virtio_init_pci(pci_dev, "virtio-balloon",
PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_BALLOON,
PCI_VENDOR_ID_REDHAT_QUMRANET,
@ -197,6 +191,12 @@ void *virtio_balloon_init(PCIBus *bus)
qemu_add_balloon_handler(virtio_balloon_to_target, s);
register_savevm("virtio-balloon", -1, 1, virtio_balloon_save, virtio_balloon_load, s);
return &s->vdev;
}
static void virtio_balloon_register_devices(void)
{
pci_qdev_register("virtio-balloon", sizeof(VirtIOBalloon),
virtio_balloon_init);
}
device_init(virtio_balloon_register_devices)

2
hw/virtio-balloon.h
View File

@ -37,6 +37,4 @@ struct virtio_balloon_config
uint32_t actual;
};
void *virtio_balloon_init(PCIBus *bus);
#endif