| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * QEMU educational PCI device | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2012-2015 Jiri Slaby | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Permission is hereby granted, free of charge, to any person obtaining a | 
					
						
							|  |  |  |  * copy of this software and associated documentation files (the "Software"), | 
					
						
							|  |  |  |  * to deal in the Software without restriction, including without limitation | 
					
						
							|  |  |  |  * the rights to use, copy, modify, merge, publish, distribute, sublicense, | 
					
						
							|  |  |  |  * and/or sell copies of the Software, and to permit persons to whom the | 
					
						
							|  |  |  |  * Software is furnished to do so, subject to the following conditions: | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * The above copyright notice and this permission notice shall be included in | 
					
						
							|  |  |  |  * all copies or substantial portions of the Software. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 
					
						
							|  |  |  |  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 
					
						
							|  |  |  |  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 
					
						
							|  |  |  |  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 
					
						
							|  |  |  |  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | 
					
						
							|  |  |  |  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 
					
						
							|  |  |  |  * DEALINGS IN THE SOFTWARE. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-01-26 18:17:17 +00:00
										 |  |  | #include "qemu/osdep.h"
 | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  | #include "hw/pci/pci.h"
 | 
					
						
							|  |  |  | #include "qemu/timer.h"
 | 
					
						
							|  |  |  | #include "qemu/main-loop.h" /* iothread mutex */
 | 
					
						
							|  |  |  | #include "qapi/visitor.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define EDU(obj)        OBJECT_CHECK(EduState, obj, "edu")
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define FACT_IRQ        0x00000001
 | 
					
						
							|  |  |  | #define DMA_IRQ         0x00000100
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define DMA_START       0x40000
 | 
					
						
							|  |  |  | #define DMA_SIZE        4096
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct { | 
					
						
							|  |  |  |     PCIDevice pdev; | 
					
						
							|  |  |  |     MemoryRegion mmio; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     QemuThread thread; | 
					
						
							|  |  |  |     QemuMutex thr_mutex; | 
					
						
							|  |  |  |     QemuCond thr_cond; | 
					
						
							|  |  |  |     bool stopping; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     uint32_t addr4; | 
					
						
							|  |  |  |     uint32_t fact; | 
					
						
							|  |  |  | #define EDU_STATUS_COMPUTING    0x01
 | 
					
						
							|  |  |  | #define EDU_STATUS_IRQFACT      0x80
 | 
					
						
							|  |  |  |     uint32_t status; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     uint32_t irq_status; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define EDU_DMA_RUN             0x1
 | 
					
						
							|  |  |  | #define EDU_DMA_DIR(cmd)        (((cmd) & 0x2) >> 1)
 | 
					
						
							|  |  |  | # define EDU_DMA_FROM_PCI       0
 | 
					
						
							|  |  |  | # define EDU_DMA_TO_PCI         1
 | 
					
						
							|  |  |  | #define EDU_DMA_IRQ             0x4
 | 
					
						
							|  |  |  |     struct dma_state { | 
					
						
							|  |  |  |         dma_addr_t src; | 
					
						
							|  |  |  |         dma_addr_t dst; | 
					
						
							|  |  |  |         dma_addr_t cnt; | 
					
						
							|  |  |  |         dma_addr_t cmd; | 
					
						
							|  |  |  |     } dma; | 
					
						
							|  |  |  |     QEMUTimer dma_timer; | 
					
						
							|  |  |  |     char dma_buf[DMA_SIZE]; | 
					
						
							|  |  |  |     uint64_t dma_mask; | 
					
						
							|  |  |  | } EduState; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_raise_irq(EduState *edu, uint32_t val) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     edu->irq_status |= val; | 
					
						
							|  |  |  |     if (edu->irq_status) { | 
					
						
							|  |  |  |         pci_set_irq(&edu->pdev, 1); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_lower_irq(EduState *edu, uint32_t val) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     edu->irq_status &= ~val; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (!edu->irq_status) { | 
					
						
							|  |  |  |         pci_set_irq(&edu->pdev, 0); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static bool within(uint32_t addr, uint32_t start, uint32_t end) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     return start <= addr && addr < end; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_check_range(uint32_t addr, uint32_t size1, uint32_t start, | 
					
						
							|  |  |  |                 uint32_t size2) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     uint32_t end1 = addr + size1; | 
					
						
							|  |  |  |     uint32_t end2 = start + size2; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (within(addr, start, end2) && | 
					
						
							|  |  |  |             end1 > addr && within(end1, start, end2)) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     hw_error("EDU: DMA range 0x%.8x-0x%.8x out of bounds (0x%.8x-0x%.8x)!", | 
					
						
							|  |  |  |             addr, end1 - 1, start, end2 - 1); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static dma_addr_t edu_clamp_addr(const EduState *edu, dma_addr_t addr) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     dma_addr_t res = addr & edu->dma_mask; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (addr != res) { | 
					
						
							|  |  |  |         printf("EDU: clamping DMA %#.16"PRIx64" to %#.16"PRIx64"!\n", addr, res); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return res; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_dma_timer(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = opaque; | 
					
						
							|  |  |  |     bool raise_irq = false; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (!(edu->dma.cmd & EDU_DMA_RUN)) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (EDU_DMA_DIR(edu->dma.cmd) == EDU_DMA_FROM_PCI) { | 
					
						
							|  |  |  |         uint32_t dst = edu->dma.dst; | 
					
						
							|  |  |  |         edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); | 
					
						
							|  |  |  |         dst -= DMA_START; | 
					
						
							|  |  |  |         pci_dma_read(&edu->pdev, edu_clamp_addr(edu, edu->dma.src), | 
					
						
							|  |  |  |                 edu->dma_buf + dst, edu->dma.cnt); | 
					
						
							|  |  |  |     } else { | 
					
						
							|  |  |  |         uint32_t src = edu->dma.src; | 
					
						
							|  |  |  |         edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); | 
					
						
							|  |  |  |         src -= DMA_START; | 
					
						
							|  |  |  |         pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst), | 
					
						
							|  |  |  |                 edu->dma_buf + src, edu->dma.cnt); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     edu->dma.cmd &= ~EDU_DMA_RUN; | 
					
						
							|  |  |  |     if (edu->dma.cmd & EDU_DMA_IRQ) { | 
					
						
							|  |  |  |         raise_irq = true; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (raise_irq) { | 
					
						
							|  |  |  |         edu_raise_irq(edu, DMA_IRQ); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void dma_rw(EduState *edu, bool write, dma_addr_t *val, dma_addr_t *dma, | 
					
						
							|  |  |  |                 bool timer) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     if (write && (edu->dma.cmd & EDU_DMA_RUN)) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (write) { | 
					
						
							|  |  |  |         *dma = *val; | 
					
						
							|  |  |  |     } else { | 
					
						
							|  |  |  |         *val = *dma; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (timer) { | 
					
						
							|  |  |  |         timer_mod(&edu->dma_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 100); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static uint64_t edu_mmio_read(void *opaque, hwaddr addr, unsigned size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = opaque; | 
					
						
							|  |  |  |     uint64_t val = ~0ULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (size != 4) { | 
					
						
							|  |  |  |         return val; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case 0x00: | 
					
						
							|  |  |  |         val = 0x010000edu; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x04: | 
					
						
							|  |  |  |         val = edu->addr4; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x08: | 
					
						
							|  |  |  |         qemu_mutex_lock(&edu->thr_mutex); | 
					
						
							|  |  |  |         val = edu->fact; | 
					
						
							|  |  |  |         qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x20: | 
					
						
							|  |  |  |         val = atomic_read(&edu->status); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x24: | 
					
						
							|  |  |  |         val = edu->irq_status; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x80: | 
					
						
							|  |  |  |         dma_rw(edu, false, &val, &edu->dma.src, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x88: | 
					
						
							|  |  |  |         dma_rw(edu, false, &val, &edu->dma.dst, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x90: | 
					
						
							|  |  |  |         dma_rw(edu, false, &val, &edu->dma.cnt, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x98: | 
					
						
							|  |  |  |         dma_rw(edu, false, &val, &edu->dma.cmd, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return val; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_mmio_write(void *opaque, hwaddr addr, uint64_t val, | 
					
						
							|  |  |  |                 unsigned size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = opaque; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (addr < 0x80 && size != 4) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (addr >= 0x80 && size != 4 && size != 8) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case 0x04: | 
					
						
							|  |  |  |         edu->addr4 = ~val; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x08: | 
					
						
							|  |  |  |         if (atomic_read(&edu->status) & EDU_STATUS_COMPUTING) { | 
					
						
							|  |  |  |             break; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         /* EDU_STATUS_COMPUTING cannot go 0->1 concurrently, because it is only
 | 
					
						
							|  |  |  |          * set in this function and it is under the iothread mutex. | 
					
						
							|  |  |  |          */ | 
					
						
							|  |  |  |         qemu_mutex_lock(&edu->thr_mutex); | 
					
						
							|  |  |  |         edu->fact = val; | 
					
						
							|  |  |  |         atomic_or(&edu->status, EDU_STATUS_COMPUTING); | 
					
						
							|  |  |  |         qemu_cond_signal(&edu->thr_cond); | 
					
						
							|  |  |  |         qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x20: | 
					
						
							|  |  |  |         if (val & EDU_STATUS_IRQFACT) { | 
					
						
							|  |  |  |             atomic_or(&edu->status, EDU_STATUS_IRQFACT); | 
					
						
							|  |  |  |         } else { | 
					
						
							|  |  |  |             atomic_and(&edu->status, ~EDU_STATUS_IRQFACT); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x60: | 
					
						
							|  |  |  |         edu_raise_irq(edu, val); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x64: | 
					
						
							|  |  |  |         edu_lower_irq(edu, val); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x80: | 
					
						
							|  |  |  |         dma_rw(edu, true, &val, &edu->dma.src, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x88: | 
					
						
							|  |  |  |         dma_rw(edu, true, &val, &edu->dma.dst, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x90: | 
					
						
							|  |  |  |         dma_rw(edu, true, &val, &edu->dma.cnt, false); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case 0x98: | 
					
						
							|  |  |  |         if (!(val & EDU_DMA_RUN)) { | 
					
						
							|  |  |  |             break; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         dma_rw(edu, true, &val, &edu->dma.cmd, true); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const MemoryRegionOps edu_mmio_ops = { | 
					
						
							|  |  |  |     .read = edu_mmio_read, | 
					
						
							|  |  |  |     .write = edu_mmio_write, | 
					
						
							|  |  |  |     .endianness = DEVICE_NATIVE_ENDIAN, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*
 | 
					
						
							| 
									
										
										
										
											2015-04-09 20:32:39 +02:00
										 |  |  |  * We purposely use a thread, so that users are forced to wait for the status | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  |  * register. | 
					
						
							|  |  |  |  */ | 
					
						
							|  |  |  | static void *edu_fact_thread(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = opaque; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     while (1) { | 
					
						
							|  |  |  |         uint32_t val, ret = 1; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         qemu_mutex_lock(&edu->thr_mutex); | 
					
						
							|  |  |  |         while ((atomic_read(&edu->status) & EDU_STATUS_COMPUTING) == 0 && | 
					
						
							|  |  |  |                         !edu->stopping) { | 
					
						
							|  |  |  |             qemu_cond_wait(&edu->thr_cond, &edu->thr_mutex); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         if (edu->stopping) { | 
					
						
							|  |  |  |             qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  |             break; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         val = edu->fact; | 
					
						
							|  |  |  |         qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         while (val > 0) { | 
					
						
							|  |  |  |             ret *= val--; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         /*
 | 
					
						
							|  |  |  |          * We should sleep for a random period here, so that students are | 
					
						
							|  |  |  |          * forced to check the status properly. | 
					
						
							|  |  |  |          */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         qemu_mutex_lock(&edu->thr_mutex); | 
					
						
							|  |  |  |         edu->fact = ret; | 
					
						
							|  |  |  |         qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  |         atomic_and(&edu->status, ~EDU_STATUS_COMPUTING); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         if (atomic_read(&edu->status) & EDU_STATUS_IRQFACT) { | 
					
						
							|  |  |  |             qemu_mutex_lock_iothread(); | 
					
						
							|  |  |  |             edu_raise_irq(edu, FACT_IRQ); | 
					
						
							|  |  |  |             qemu_mutex_unlock_iothread(); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-12-18 16:55:35 +08:00
										 |  |  | static void pci_edu_realize(PCIDevice *pdev, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  | { | 
					
						
							|  |  |  |     EduState *edu = DO_UPCAST(EduState, pdev, pdev); | 
					
						
							|  |  |  |     uint8_t *pci_conf = pdev->config; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     timer_init_ms(&edu->dma_timer, QEMU_CLOCK_VIRTUAL, edu_dma_timer, edu); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     qemu_mutex_init(&edu->thr_mutex); | 
					
						
							|  |  |  |     qemu_cond_init(&edu->thr_cond); | 
					
						
							|  |  |  |     qemu_thread_create(&edu->thread, "edu", edu_fact_thread, | 
					
						
							|  |  |  |                        edu, QEMU_THREAD_JOINABLE); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     pci_config_set_interrupt_pin(pci_conf, 1); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, | 
					
						
							|  |  |  |                     "edu-mmio", 1 << 20); | 
					
						
							|  |  |  |     pci_register_bar(pdev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &edu->mmio); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void pci_edu_uninit(PCIDevice *pdev) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = DO_UPCAST(EduState, pdev, pdev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     qemu_mutex_lock(&edu->thr_mutex); | 
					
						
							|  |  |  |     edu->stopping = true; | 
					
						
							|  |  |  |     qemu_mutex_unlock(&edu->thr_mutex); | 
					
						
							|  |  |  |     qemu_cond_signal(&edu->thr_cond); | 
					
						
							|  |  |  |     qemu_thread_join(&edu->thread); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     qemu_cond_destroy(&edu->thr_cond); | 
					
						
							|  |  |  |     qemu_mutex_destroy(&edu->thr_mutex); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     timer_del(&edu->dma_timer); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void edu_obj_uint64(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                            void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  | { | 
					
						
							|  |  |  |     uint64_t *val = opaque; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint64(v, name, val, errp); | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_instance_init(Object *obj) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     EduState *edu = EDU(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     edu->dma_mask = (1UL << 28) - 1; | 
					
						
							|  |  |  |     object_property_add(obj, "dma_mask", "uint64", edu_obj_uint64, | 
					
						
							|  |  |  |                     edu_obj_uint64, NULL, &edu->dma_mask, NULL); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void edu_class_init(ObjectClass *class, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     PCIDeviceClass *k = PCI_DEVICE_CLASS(class); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-12-18 16:55:35 +08:00
										 |  |  |     k->realize = pci_edu_realize; | 
					
						
							| 
									
										
										
										
											2015-01-21 17:48:33 +01:00
										 |  |  |     k->exit = pci_edu_uninit; | 
					
						
							|  |  |  |     k->vendor_id = PCI_VENDOR_ID_QEMU; | 
					
						
							|  |  |  |     k->device_id = 0x11e8; | 
					
						
							|  |  |  |     k->revision = 0x10; | 
					
						
							|  |  |  |     k->class_id = PCI_CLASS_OTHERS; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void pci_edu_register_types(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     static const TypeInfo edu_info = { | 
					
						
							|  |  |  |         .name          = "edu", | 
					
						
							|  |  |  |         .parent        = TYPE_PCI_DEVICE, | 
					
						
							|  |  |  |         .instance_size = sizeof(EduState), | 
					
						
							|  |  |  |         .instance_init = edu_instance_init, | 
					
						
							|  |  |  |         .class_init    = edu_class_init, | 
					
						
							|  |  |  |     }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     type_register_static(&edu_info); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | type_init(pci_edu_register_types) |