* [PATCH 0/3] device-assigment: cleanup
@ 2011-02-24 21:56 Juan Quintela
2011-02-24 21:56 ` [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Juan Quintela
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Juan Quintela @ 2011-02-24 21:56 UTC (permalink / raw)
To: kvm; +Cc: alex.williamson
Hi
This series just:
- use qemu_mallocz() everywhere.
- remove NULL tests for qemu_mallocz().
- change all container_of to DO_UPCAST() (there were both of them).
Later, Juan.
Juan Quintela (3):
device-assignment: Use qemu_mallocz() instead of calloc()
device-assignment: Be consistent and use DO_UPCAST everywhere
device-assignment: remove qemu_mallocz() test
hw/device-assignment.c | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
--
1.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela @ 2011-02-24 21:56 ` Juan Quintela 2011-02-24 21:56 ` [PATCH 2/3] device-assignment: Be consistent and use DO_UPCAST everywhere Juan Quintela ` (3 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Juan Quintela @ 2011-02-24 21:56 UTC (permalink / raw) To: kvm; +Cc: alex.williamson Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/device-assignment.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index e5205cf..115df19 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1106,11 +1106,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) if (ctrl_byte & PCI_MSI_FLAGS_ENABLE) { int pos = ctrl_pos - PCI_MSI_FLAGS; - assigned_dev->entry = calloc(1, sizeof(struct kvm_irq_routing_entry)); - if (!assigned_dev->entry) { - perror("assigned_dev_update_msi: "); - return; - } + assigned_dev->entry = qemu_mallocz(sizeof(*(assigned_dev->entry))); assigned_dev->entry->u.msi.address_lo = pci_get_long(pci_dev->config + pos + PCI_MSI_ADDRESS_LO); assigned_dev->entry->u.msi.address_hi = 0; @@ -1188,11 +1184,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) free_dev_irq_entries(adev); adev->irq_entries_nr = entries_nr; - adev->entry = calloc(entries_nr, sizeof(struct kvm_irq_routing_entry)); - if (!adev->entry) { - perror("assigned_dev_update_msix_mmio: "); - return -errno; - } + adev->entry = qemu_mallocz(entries_nr * sizeof(*(adev->entry))); msix_entry.assigned_dev_id = msix_nr.assigned_dev_id; entries_nr = 0; -- 1.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] device-assignment: Be consistent and use DO_UPCAST everywhere 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela 2011-02-24 21:56 ` [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Juan Quintela @ 2011-02-24 21:56 ` Juan Quintela 2011-02-24 21:56 ` [PATCH 3/3] device-assignment: remove qemu_mallocz() test Juan Quintela ` (2 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Juan Quintela @ 2011-02-24 21:56 UTC (permalink / raw) To: kvm; +Cc: alex.williamson Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/device-assignment.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 115df19..dc70b80 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -246,7 +246,7 @@ static void assigned_dev_iomem_map_slow(PCIDevice *pci_dev, int region_num, pcibus_t e_phys, pcibus_t e_size, int type) { - AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); AssignedDevRegion *region = &r_dev->v_addrs[region_num]; PCIRegion *real_region = &r_dev->real_device.regions[region_num]; int m; @@ -270,7 +270,7 @@ static void assigned_dev_iomem_map_slow(PCIDevice *pci_dev, int region_num, static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num, pcibus_t e_phys, pcibus_t e_size, int type) { - AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); AssignedDevRegion *region = &r_dev->v_addrs[region_num]; PCIRegion *real_region = &r_dev->real_device.regions[region_num]; int ret = 0; @@ -304,7 +304,7 @@ static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num, static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, pcibus_t addr, pcibus_t size, int type) { - AssignedDevice *r_dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *r_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); AssignedDevRegion *region = &r_dev->v_addrs[region_num]; int first_map = (region->e_size == 0); CPUState *env; @@ -350,7 +350,7 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, static uint32_t assigned_dev_pci_read(PCIDevice *d, int pos, int len) { - AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); + AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d); uint32_t val; ssize_t ret; int fd = pci_dev->real_device.config_fd; @@ -377,7 +377,7 @@ static uint8_t assigned_dev_pci_read_byte(PCIDevice *d, int pos) static void assigned_dev_pci_write(PCIDevice *d, int pos, uint32_t val, int len) { - AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); + AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d); ssize_t ret; int fd = pci_dev->real_device.config_fd; @@ -430,7 +430,7 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, { int fd; ssize_t ret; - AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); + AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d); DEBUG("(%x.%x): address=%04x val=0x%08x len=%d\n", ((d->devfn >> 3) & 0x1F), (d->devfn & 0x7), @@ -477,7 +477,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address, uint32_t val = 0; int fd; ssize_t ret; - AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); + AssignedDevice *pci_dev = DO_UPCAST(AssignedDevice, dev, d); if (address >= PCI_CONFIG_HEADER_SIZE && d->config_map[address]) { val = assigned_device_pci_cap_read_config(d, address, len); @@ -1079,7 +1079,7 @@ void assigned_dev_update_irqs(void) static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) { struct kvm_assigned_irq assigned_irq_data; - AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint8_t ctrl_byte = pci_dev->config[ctrl_pos]; int r; @@ -1144,7 +1144,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) #ifdef KVM_CAP_DEVICE_MSIX static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) { - AssignedDevice *adev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *adev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint16_t entries_nr = 0, entries_max_nr; int pos = 0, i, r = 0; uint32_t msg_addr, msg_upper_addr, msg_data, msg_ctrl; @@ -1235,7 +1235,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos) { struct kvm_assigned_irq assigned_irq_data; - AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *assigned_dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint16_t *ctrl_word = (uint16_t *)(pci_dev->config + ctrl_pos); int r; @@ -1384,7 +1384,7 @@ static void assigned_device_pci_cap_write_config(PCIDevice *pci_dev, static int assigned_device_pci_cap_init(PCIDevice *pci_dev) { - AssignedDevice *dev = container_of(pci_dev, AssignedDevice, dev); + AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); PCIRegion *pci_region = dev->real_device.regions; int ret, pos; -- 1.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] device-assignment: remove qemu_mallocz() test 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela 2011-02-24 21:56 ` [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Juan Quintela 2011-02-24 21:56 ` [PATCH 2/3] device-assignment: Be consistent and use DO_UPCAST everywhere Juan Quintela @ 2011-02-24 21:56 ` Juan Quintela 2011-02-24 22:04 ` [PATCH 0/3] device-assigment: cleanup Alex Williamson 2011-03-01 20:31 ` Marcelo Tosatti 4 siblings, 0 replies; 6+ messages in thread From: Juan Quintela @ 2011-02-24 21:56 UTC (permalink / raw) To: kvm; +Cc: alex.williamson Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/device-assignment.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index dc70b80..968a8d9 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -319,11 +319,6 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, struct ioperm_data *data; data = qemu_mallocz(sizeof(struct ioperm_data)); - if (data == NULL) { - fprintf(stderr, "%s: Out of memory\n", __func__); - exit(1); - } - data->start_port = region->u.r_baseport; data->num = region->r_size; data->turn_on = 1; -- 1.7.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] device-assigment: cleanup 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela ` (2 preceding siblings ...) 2011-02-24 21:56 ` [PATCH 3/3] device-assignment: remove qemu_mallocz() test Juan Quintela @ 2011-02-24 22:04 ` Alex Williamson 2011-03-01 20:31 ` Marcelo Tosatti 4 siblings, 0 replies; 6+ messages in thread From: Alex Williamson @ 2011-02-24 22:04 UTC (permalink / raw) To: Juan Quintela; +Cc: kvm On Thu, 2011-02-24 at 22:56 +0100, Juan Quintela wrote: > Hi > > This series just: > - use qemu_mallocz() everywhere. > - remove NULL tests for qemu_mallocz(). > - change all container_of to DO_UPCAST() (there were both of them). > > Later, Juan. > > Juan Quintela (3): > device-assignment: Use qemu_mallocz() instead of calloc() > device-assignment: Be consistent and use DO_UPCAST everywhere > device-assignment: remove qemu_mallocz() test > > hw/device-assignment.c | 39 +++++++++++++-------------------------- > 1 files changed, 13 insertions(+), 26 deletions(-) > Looks good to me. Acked-by: Alex Williamson <alex.williamson@redhat.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] device-assigment: cleanup 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela ` (3 preceding siblings ...) 2011-02-24 22:04 ` [PATCH 0/3] device-assigment: cleanup Alex Williamson @ 2011-03-01 20:31 ` Marcelo Tosatti 4 siblings, 0 replies; 6+ messages in thread From: Marcelo Tosatti @ 2011-03-01 20:31 UTC (permalink / raw) To: Juan Quintela; +Cc: kvm, alex.williamson On Thu, Feb 24, 2011 at 10:56:17PM +0100, Juan Quintela wrote: > Hi > > This series just: > - use qemu_mallocz() everywhere. > - remove NULL tests for qemu_mallocz(). > - change all container_of to DO_UPCAST() (there were both of them). > > Later, Juan. > > Juan Quintela (3): > device-assignment: Use qemu_mallocz() instead of calloc() > device-assignment: Be consistent and use DO_UPCAST everywhere > device-assignment: remove qemu_mallocz() test > > hw/device-assignment.c | 39 +++++++++++++-------------------------- > 1 files changed, 13 insertions(+), 26 deletions(-) Applied, thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-01 20:37 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-02-24 21:56 [PATCH 0/3] device-assigment: cleanup Juan Quintela 2011-02-24 21:56 ` [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Juan Quintela 2011-02-24 21:56 ` [PATCH 2/3] device-assignment: Be consistent and use DO_UPCAST everywhere Juan Quintela 2011-02-24 21:56 ` [PATCH 3/3] device-assignment: remove qemu_mallocz() test Juan Quintela 2011-02-24 22:04 ` [PATCH 0/3] device-assigment: cleanup Alex Williamson 2011-03-01 20:31 ` Marcelo Tosatti
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.