david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'mst/for_anthony' into staging

Browse Source
This commit is contained in:
Anthony Liguori 2010-05-17 12:41:39 -05:00
commit f7ce72878c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/pci.c
View File

@ -324,7 +324,7 @@ static VMStateInfo vmstate_info_pci_config = {
static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size) static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size)
{ {
PCIDevice *s = container_of(pv, PCIDevice, config); PCIDevice *s = container_of(pv, PCIDevice, irq_state);
uint32_t irq_state[PCI_NUM_PINS]; uint32_t irq_state[PCI_NUM_PINS];
int i; int i;
for (i = 0; i < PCI_NUM_PINS; ++i) { for (i = 0; i < PCI_NUM_PINS; ++i) {
@ -346,7 +346,7 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size)
static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size) static void put_pci_irq_state(QEMUFile *f, void *pv, size_t size)
{ {
int i; int i;
PCIDevice *s = container_of(pv, PCIDevice, config); PCIDevice *s = container_of(pv, PCIDevice, irq_state);
for (i = 0; i < PCI_NUM_PINS; ++i) { for (i = 0; i < PCI_NUM_PINS; ++i) {
qemu_put_be32(f, pci_irq_state(s, i)); qemu_put_be32(f, pci_irq_state(s, i));
@ -627,6 +627,13 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
return pci_dev; return pci_dev;
} }
static void do_pci_unregister_device(PCIDevice *pci_dev)
{
qemu_free_irqs(pci_dev->irq);
pci_dev->bus->devices[pci_dev->devfn] = NULL;
pci_config_free(pci_dev);
}
PCIDevice *pci_register_device(PCIBus *bus, const char *name, PCIDevice *pci_register_device(PCIBus *bus, const char *name,
int instance_size, int devfn, int instance_size, int devfn,
PCIConfigReadFunc *config_read, PCIConfigReadFunc *config_read,
@ -682,10 +689,7 @@ static int pci_unregister_device(DeviceState *dev)
return ret; return ret;
pci_unregister_io_regions(pci_dev); pci_unregister_io_regions(pci_dev);
do_pci_unregister_device(pci_dev);
qemu_free_irqs(pci_dev->irq);
pci_dev->bus->devices[pci_dev->devfn] = NULL;
pci_config_free(pci_dev);
return 0; return 0;
} }
@ -1654,8 +1658,10 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
if (pci_dev == NULL) if (pci_dev == NULL)
return -1; return -1;
rc = info->init(pci_dev); rc = info->init(pci_dev);
if (rc != 0) if (rc != 0) {
do_pci_unregister_device(pci_dev);
return rc; return rc;
}
/* rom loading */ /* rom loading */
if (pci_dev->romfile == NULL && info->romfile != NULL) if (pci_dev->romfile == NULL && info->romfile != NULL)

2
hw/virtio-net.c
View File

@ -227,7 +227,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features)
if (!tap_get_vhost_net(n->nic->nc.peer)) { if (!tap_get_vhost_net(n->nic->nc.peer)) {
return; return;
} }
return vhost_net_ack_features(tap_get_vhost_net(n->nic->nc.peer), features); vhost_net_ack_features(tap_get_vhost_net(n->nic->nc.peer), features);
} }
static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd, static int virtio_net_handle_rx_mode(VirtIONet *n, uint8_t cmd,

2
hw/virtio.c
View File

@ -677,6 +677,8 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f)
features, supported_features); features, supported_features);
return -1; return -1;
} }
if (vdev->set_features)
vdev->set_features(vdev, features);
vdev->guest_features = features; vdev->guest_features = features;
vdev->config_len = qemu_get_be32(f); vdev->config_len = qemu_get_be32(f);
qemu_get_buffer(f, vdev->config, vdev->config_len); qemu_get_buffer(f, vdev->config, vdev->config_len);