From: Avi Kivity <avi@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [RFC v4 55/58] pci: convert pci rom to memory API Date: Sun, 17 Jul 2011 14:14:22 +0300 [thread overview] Message-ID: <1310901265-32051-56-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1310901265-32051-1-git-send-email-avi@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/pci.c | 20 +++++++------------- hw/pci.h | 3 ++- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 9db6fc8..8c7a418 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1858,11 +1858,6 @@ static uint8_t pci_find_capability_list(PCIDevice *pdev, uint8_t cap_id, return next; } -static void pci_map_option_rom(PCIDevice *pdev, int region_num, pcibus_t addr, pcibus_t size, int type) -{ - cpu_register_physical_memory(addr, size, pdev->rom_offset); -} - /* Patch the PCI vendor and device ids in a PCI rom image if necessary. This is needed for an option rom which is used for more than one device. */ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, int size) @@ -1966,9 +1961,9 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) snprintf(name, sizeof(name), "%s.rom", pdev->qdev.info->vmsd->name); else snprintf(name, sizeof(name), "%s.rom", pdev->qdev.info->name); - pdev->rom_offset = qemu_ram_alloc(&pdev->qdev, name, size); - - ptr = qemu_get_ram_ptr(pdev->rom_offset); + pdev->has_rom = true; + memory_region_init_ram(&pdev->rom, &pdev->qdev, name, size); + ptr = memory_region_get_ram_ptr(&pdev->rom); load_image(path, ptr); qemu_free(path); @@ -1979,19 +1974,18 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) qemu_put_ram_ptr(ptr); - pci_register_bar(pdev, PCI_ROM_SLOT, size, - 0, pci_map_option_rom); + pci_register_bar_region(pdev, PCI_ROM_SLOT, 0, &pdev->rom); return 0; } static void pci_del_option_rom(PCIDevice *pdev) { - if (!pdev->rom_offset) + if (!pdev->has_rom) return; - qemu_ram_free(pdev->rom_offset); - pdev->rom_offset = 0; + memory_region_destroy(&pdev->rom); + pdev->has_rom = false; } /* diff --git a/hw/pci.h b/hw/pci.h index 5209964..c5174bd 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -192,7 +192,8 @@ struct PCIDevice { /* Location of option rom */ char *romfile; - ram_addr_t rom_offset; + bool has_rom; + MemoryRegion rom; uint32_t rom_bar; }; -- 1.7.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [RFC v4 55/58] pci: convert pci rom to memory API Date: Sun, 17 Jul 2011 14:14:22 +0300 [thread overview] Message-ID: <1310901265-32051-56-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1310901265-32051-1-git-send-email-avi@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/pci.c | 20 +++++++------------- hw/pci.h | 3 ++- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 9db6fc8..8c7a418 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1858,11 +1858,6 @@ static uint8_t pci_find_capability_list(PCIDevice *pdev, uint8_t cap_id, return next; } -static void pci_map_option_rom(PCIDevice *pdev, int region_num, pcibus_t addr, pcibus_t size, int type) -{ - cpu_register_physical_memory(addr, size, pdev->rom_offset); -} - /* Patch the PCI vendor and device ids in a PCI rom image if necessary. This is needed for an option rom which is used for more than one device. */ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, int size) @@ -1966,9 +1961,9 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) snprintf(name, sizeof(name), "%s.rom", pdev->qdev.info->vmsd->name); else snprintf(name, sizeof(name), "%s.rom", pdev->qdev.info->name); - pdev->rom_offset = qemu_ram_alloc(&pdev->qdev, name, size); - - ptr = qemu_get_ram_ptr(pdev->rom_offset); + pdev->has_rom = true; + memory_region_init_ram(&pdev->rom, &pdev->qdev, name, size); + ptr = memory_region_get_ram_ptr(&pdev->rom); load_image(path, ptr); qemu_free(path); @@ -1979,19 +1974,18 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) qemu_put_ram_ptr(ptr); - pci_register_bar(pdev, PCI_ROM_SLOT, size, - 0, pci_map_option_rom); + pci_register_bar_region(pdev, PCI_ROM_SLOT, 0, &pdev->rom); return 0; } static void pci_del_option_rom(PCIDevice *pdev) { - if (!pdev->rom_offset) + if (!pdev->has_rom) return; - qemu_ram_free(pdev->rom_offset); - pdev->rom_offset = 0; + memory_region_destroy(&pdev->rom); + pdev->has_rom = false; } /* diff --git a/hw/pci.h b/hw/pci.h index 5209964..c5174bd 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -192,7 +192,8 @@ struct PCIDevice { /* Location of option rom */ char *romfile; - ram_addr_t rom_offset; + bool has_rom; + MemoryRegion rom; uint32_t rom_bar; }; -- 1.7.5.3
next prev parent reply other threads:[~2011-07-17 11:14 UTC|newest] Thread overview: 194+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-17 11:13 [RFC v4 00/58] Memory API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 01/58] Hierarchical memory region API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 02/58] memory: implement dirty tracking Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 03/58] memory: merge adjacent segments of a single memory region Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 04/58] Internal interfaces for memory API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 05/58] memory: abstract address space operations Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 06/58] memory: rename MemoryRegion::has_ram_addr to ::terminates Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 07/58] memory: late initialization of ram_addr Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 08/58] memory: I/O address space support Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 09/58] memory: add backward compatibility for old portio registration Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 10/58] memory: add backward compatibility for old mmio registration Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 11/58] memory: add ioeventfd support Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-20 17:29 ` Blue Swirl 2011-07-20 17:31 ` Avi Kivity 2011-07-17 11:13 ` [RFC v4 12/58] exec.c: initialize memory map Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 13/58] ioport: register ranges by byte aligned addresses always Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 14/58] pc: grab system_memory Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 15/58] pc: convert pc_memory_init() to memory API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 16/58] pc: move global memory map out of pc_init1() and into its callers Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 17/58] pci: pass address space to pci bus when created Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 18/58] pci: add MemoryRegion based BAR management API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 19/58] sysbus: add MemoryRegion based memory " Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 20/58] usb-ohci: convert to MemoryRegion Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 21/58] pci: add API to get a BAR's mapped address Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 22/58] vmsvga: don't remember pci BAR address in callback any more Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 23/58] vga: convert vga and its derivatives to the memory API Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-20 14:05 ` Jan Kiszka 2011-07-20 14:05 ` [Qemu-devel] " Jan Kiszka 2011-07-20 14:40 ` Avi Kivity 2011-07-20 14:40 ` [Qemu-devel] " Avi Kivity 2011-07-20 14:45 ` Jan Kiszka 2011-07-20 14:45 ` [Qemu-devel] " Jan Kiszka 2011-07-20 14:48 ` Avi Kivity 2011-07-20 14:48 ` [Qemu-devel] " Avi Kivity 2011-07-20 14:52 ` Jan Kiszka 2011-07-20 14:52 ` [Qemu-devel] " Jan Kiszka 2011-07-20 14:55 ` Avi Kivity 2011-07-20 14:55 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 24/58] cirrus: simplify mmio BAR access functions Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 25/58] cirrus: simplify bitblt " Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 26/58] cirrus: simplify vga window mmio " Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 27/58] vga: " Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 28/58] cirrus: simplify linear framebuffer " Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 29/58] Integrate I/O memory regions into qemu Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 30/58] exec.c: fix initialization of system I/O memory region Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 31/58] pci: pass I/O address space to new PCI bus Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:13 ` [RFC v4 32/58] pci: allow I/O BARs to be registered with pci_register_bar_region() Avi Kivity 2011-07-17 11:13 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 33/58] rtl8139: convert to memory API Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 34/58] ac97: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 35/58] e1000: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 36/58] eepro100: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 37/58] es1370: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 38/58] ide: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 39/58] ivshmem: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 40/58] virtio-pci: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 41/58] ahci: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 42/58] intel-hda: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 43/58] lsi53c895a: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 44/58] ppc: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 45/58] ne2000: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 46/58] pcnet: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 47/58] i6300esb: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 48/58] isa-mmio: concert " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 49/58] sun4u: convert " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 50/58] ehci: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 51/58] uhci: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 52/58] xen-platform: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 53/58] msix: " Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 54/58] pci: remove pci_register_bar_simple() Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` Avi Kivity [this message] 2011-07-17 11:14 ` [Qemu-devel] [RFC v4 55/58] pci: convert pci rom to memory API Avi Kivity 2011-07-17 11:14 ` [RFC v4 56/58] pci: remove pci_register_bar() Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 57/58] pci: fold BAR mapping function into its caller Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-17 11:14 ` [RFC v4 58/58] pci: rename pci_register_bar_region() to pci_register_bar() Avi Kivity 2011-07-17 11:14 ` [Qemu-devel] " Avi Kivity 2011-07-19 13:09 ` [Qemu-devel] [RFC v4 00/58] Memory API Anthony Liguori 2011-07-19 13:27 ` Avi Kivity 2011-07-19 14:50 ` Anthony Liguori 2011-07-19 16:05 ` Avi Kivity 2011-07-19 16:10 ` Avi Kivity 2011-07-19 20:51 ` Anthony Liguori 2011-07-19 21:03 ` Sasha Levin 2011-07-19 21:03 ` Sasha Levin 2011-07-20 2:53 ` Anthony Liguori 2011-07-20 6:10 ` Sasha Levin 2011-07-20 8:12 ` Avi Kivity 2011-07-20 8:12 ` Avi Kivity 2011-07-20 12:12 ` Anthony Liguori 2011-07-20 8:10 ` Avi Kivity 2011-07-20 14:31 ` Anthony Liguori 2011-07-20 14:45 ` Avi Kivity 2011-07-19 13:56 ` Michael S. Tsirkin 2011-07-19 13:56 ` [Qemu-devel] " Michael S. Tsirkin 2011-07-19 13:57 ` Avi Kivity 2011-07-19 13:57 ` [Qemu-devel] " Avi Kivity 2011-07-19 17:01 ` Jan Kiszka 2011-07-19 17:01 ` [Qemu-devel] " Jan Kiszka 2011-07-19 17:14 ` Avi Kivity 2011-07-19 17:14 ` [Qemu-devel] " Avi Kivity 2011-07-19 17:30 ` Jan Kiszka 2011-07-19 17:30 ` [Qemu-devel] " Jan Kiszka 2011-07-20 8:13 ` Avi Kivity 2011-07-20 8:13 ` [Qemu-devel] " Avi Kivity 2011-07-20 11:20 ` Jan Kiszka 2011-07-20 11:20 ` [Qemu-devel] " Jan Kiszka 2011-07-20 11:59 ` Avi Kivity 2011-07-20 11:59 ` [Qemu-devel] " Avi Kivity 2011-07-20 11:43 ` Jan Kiszka 2011-07-20 11:43 ` [Qemu-devel] " Jan Kiszka 2011-07-20 11:57 ` Avi Kivity 2011-07-20 11:57 ` [Qemu-devel] " Avi Kivity 2011-07-20 13:57 ` Jan Kiszka 2011-07-20 13:57 ` [Qemu-devel] " Jan Kiszka 2011-07-20 14:32 ` Avi Kivity 2011-07-20 14:32 ` [Qemu-devel] " Avi Kivity 2011-07-20 14:37 ` Michael S. Tsirkin 2011-07-20 14:37 ` [Qemu-devel] " Michael S. Tsirkin 2011-07-20 14:42 ` Jan Kiszka 2011-07-20 14:42 ` [Qemu-devel] " Jan Kiszka 2011-07-20 14:54 ` Avi Kivity 2011-07-20 14:54 ` [Qemu-devel] " Avi Kivity 2011-07-20 15:58 ` Jan Kiszka 2011-07-20 15:58 ` [Qemu-devel] " Jan Kiszka 2011-07-20 16:02 ` Avi Kivity 2011-07-20 16:02 ` [Qemu-devel] " Avi Kivity 2011-07-20 16:13 ` Jan Kiszka 2011-07-20 16:13 ` [Qemu-devel] " Jan Kiszka 2011-07-20 16:19 ` Avi Kivity 2011-07-20 16:19 ` [Qemu-devel] " Avi Kivity 2011-07-20 16:10 ` Michael S. Tsirkin 2011-07-20 16:10 ` [Qemu-devel] " Michael S. Tsirkin 2011-07-20 16:52 ` Avi Kivity 2011-07-20 16:52 ` [Qemu-devel] " Avi Kivity 2011-07-20 17:06 ` Michael S. Tsirkin 2011-07-20 17:06 ` [Qemu-devel] " Michael S. Tsirkin 2011-07-20 16:53 ` Avi Kivity 2011-07-20 16:53 ` [Qemu-devel] " Avi Kivity
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1310901265-32051-56-git-send-email-avi@redhat.com \ --to=avi@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.