diff options
| author | Anthony Liguori | 2011-05-12 15:06:06 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-05-12 15:06:06 +0200 |
| commit | 89bb563f6912b3f538d6bdf5833881ed7cdbd923 (patch) | |
| tree | 601d288a7cac548a018cd5f6bcb1c09af032ee9a /hw/pci.c | |
| parent | usb-linux: Add missing break statement (diff) | |
| parent | xen: Add Xen hypercall for sleep state in the cmos_s3 callback. (diff) | |
| download | qemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.tar.gz qemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.tar.xz qemu-89bb563f6912b3f538d6bdf5833881ed7cdbd923.zip | |
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1922,6 +1922,8 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) pci_patch_ids(pdev, ptr, size); } + qemu_put_ram_ptr(ptr); + pci_register_bar(pdev, PCI_ROM_SLOT, size, 0, pci_map_option_rom); |