| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * QEMU CG3 Frame buffer | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2012 Bob Breuer | 
					
						
							|  |  |  |  * Copyright (c) 2013 Mark Cave-Ayland | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * 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:13 +00:00
										 |  |  | #include "qemu/osdep.h"
 | 
					
						
							| 
									
										
											  
											
												include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef.  Since then, we've moved to include qemu/osdep.h
everywhere.  Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h.  That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h.  Include qapi/error.h in .c files that need it and don't
get it now.  Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly.  Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third.  Unfortunately, the number depending on
qapi-types.h shrinks only a little.  More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
											
										 
											2016-03-14 09:01:28 +01:00
										 |  |  | #include "qapi/error.h"
 | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  | #include "qemu-common.h"
 | 
					
						
							| 
									
										
										
										
											2016-03-15 16:58:45 +01:00
										 |  |  | #include "cpu.h"
 | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  | #include "qemu/error-report.h"
 | 
					
						
							|  |  |  | #include "ui/console.h"
 | 
					
						
							|  |  |  | #include "hw/sysbus.h"
 | 
					
						
							|  |  |  | #include "hw/loader.h"
 | 
					
						
							| 
									
										
										
										
											2015-12-15 13:16:16 +01:00
										 |  |  | #include "qemu/log.h"
 | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  | 
 | 
					
						
							|  |  |  | /* Change to 1 to enable debugging */ | 
					
						
							|  |  |  | #define DEBUG_CG3 0
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define CG3_ROM_FILE  "QEMU,cgthree.bin"
 | 
					
						
							|  |  |  | #define FCODE_MAX_ROM_SIZE 0x10000
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define CG3_REG_SIZE            0x20
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define CG3_REG_BT458_ADDR      0x0
 | 
					
						
							|  |  |  | #define CG3_REG_BT458_COLMAP    0x4
 | 
					
						
							|  |  |  | #define CG3_REG_FBC_CTRL        0x10
 | 
					
						
							|  |  |  | #define CG3_REG_FBC_STATUS      0x11
 | 
					
						
							|  |  |  | #define CG3_REG_FBC_CURSTART    0x12
 | 
					
						
							|  |  |  | #define CG3_REG_FBC_CUREND      0x13
 | 
					
						
							|  |  |  | #define CG3_REG_FBC_VCTRL       0x14
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Control register flags */ | 
					
						
							|  |  |  | #define CG3_CR_ENABLE_INTS      0x80
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Status register flags */ | 
					
						
							|  |  |  | #define CG3_SR_PENDING_INT      0x80
 | 
					
						
							|  |  |  | #define CG3_SR_1152_900_76_B    0x60
 | 
					
						
							|  |  |  | #define CG3_SR_ID_COLOR         0x01
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define CG3_VRAM_SIZE 0x100000
 | 
					
						
							|  |  |  | #define CG3_VRAM_OFFSET 0x800000
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define DPRINTF(fmt, ...) do { \
 | 
					
						
							|  |  |  |     if (DEBUG_CG3) { \ | 
					
						
							|  |  |  |         printf("CG3: " fmt , ## __VA_ARGS__); \ | 
					
						
							|  |  |  |     } \ | 
					
						
							|  |  |  | } while (0); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define TYPE_CG3 "cgthree"
 | 
					
						
							|  |  |  | #define CG3(obj) OBJECT_CHECK(CG3State, (obj), TYPE_CG3)
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct CG3State { | 
					
						
							|  |  |  |     SysBusDevice parent_obj; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     QemuConsole *con; | 
					
						
							|  |  |  |     qemu_irq irq; | 
					
						
							|  |  |  |     hwaddr prom_addr; | 
					
						
							|  |  |  |     MemoryRegion vram_mem; | 
					
						
							|  |  |  |     MemoryRegion rom; | 
					
						
							|  |  |  |     MemoryRegion reg; | 
					
						
							|  |  |  |     uint32_t vram_size; | 
					
						
							|  |  |  |     int full_update; | 
					
						
							|  |  |  |     uint8_t regs[16]; | 
					
						
							|  |  |  |     uint8_t r[256], g[256], b[256]; | 
					
						
							|  |  |  |     uint16_t width, height, depth; | 
					
						
							|  |  |  |     uint8_t dac_index, dac_state; | 
					
						
							|  |  |  | } CG3State; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_update_display(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = opaque; | 
					
						
							|  |  |  |     DisplaySurface *surface = qemu_console_surface(s->con); | 
					
						
							|  |  |  |     const uint8_t *pix; | 
					
						
							|  |  |  |     uint32_t *data; | 
					
						
							|  |  |  |     uint32_t dval; | 
					
						
							|  |  |  |     int x, y, y_start; | 
					
						
							|  |  |  |     unsigned int width, height; | 
					
						
							|  |  |  |     ram_addr_t page, page_min, page_max; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (surface_bits_per_pixel(surface) != 32) { | 
					
						
							|  |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     width = s->width; | 
					
						
							|  |  |  |     height = s->height; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     y_start = -1; | 
					
						
							|  |  |  |     page_min = -1; | 
					
						
							|  |  |  |     page_max = 0; | 
					
						
							|  |  |  |     page = 0; | 
					
						
							|  |  |  |     pix = memory_region_get_ram_ptr(&s->vram_mem); | 
					
						
							|  |  |  |     data = (uint32_t *)surface_data(surface); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-04-22 13:12:40 +02:00
										 |  |  |     memory_region_sync_dirty_bitmap(&s->vram_mem); | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |     for (y = 0; y < height; y++) { | 
					
						
							|  |  |  |         int update = s->full_update; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         page = (y * width) & TARGET_PAGE_MASK; | 
					
						
							|  |  |  |         update |= memory_region_get_dirty(&s->vram_mem, page, page + width, | 
					
						
							|  |  |  |                                           DIRTY_MEMORY_VGA); | 
					
						
							|  |  |  |         if (update) { | 
					
						
							|  |  |  |             if (y_start < 0) { | 
					
						
							|  |  |  |                 y_start = y; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |             if (page < page_min) { | 
					
						
							|  |  |  |                 page_min = page; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |             if (page > page_max) { | 
					
						
							|  |  |  |                 page_max = page; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             for (x = 0; x < width; x++) { | 
					
						
							|  |  |  |                 dval = *pix++; | 
					
						
							|  |  |  |                 dval = (s->r[dval] << 16) | (s->g[dval] << 8) | s->b[dval]; | 
					
						
							|  |  |  |                 *data++ = dval; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |         } else { | 
					
						
							|  |  |  |             if (y_start >= 0) { | 
					
						
							|  |  |  |                 dpy_gfx_update(s->con, 0, y_start, s->width, y - y_start); | 
					
						
							|  |  |  |                 y_start = -1; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |             pix += width; | 
					
						
							|  |  |  |             data += width; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     s->full_update = 0; | 
					
						
							|  |  |  |     if (y_start >= 0) { | 
					
						
							|  |  |  |         dpy_gfx_update(s->con, 0, y_start, s->width, y - y_start); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     if (page_max >= page_min) { | 
					
						
							|  |  |  |         memory_region_reset_dirty(&s->vram_mem, | 
					
						
							|  |  |  |                               page_min, page_max - page_min + TARGET_PAGE_SIZE, | 
					
						
							|  |  |  |                               DIRTY_MEMORY_VGA); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     /* vsync interrupt? */ | 
					
						
							|  |  |  |     if (s->regs[0] & CG3_CR_ENABLE_INTS) { | 
					
						
							|  |  |  |         s->regs[1] |= CG3_SR_PENDING_INT; | 
					
						
							|  |  |  |         qemu_irq_raise(s->irq); | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_invalidate_display(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = opaque; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     memory_region_set_dirty(&s->vram_mem, 0, CG3_VRAM_SIZE); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static uint64_t cg3_reg_read(void *opaque, hwaddr addr, unsigned size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = opaque; | 
					
						
							|  |  |  |     int val; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case CG3_REG_BT458_ADDR: | 
					
						
							|  |  |  |     case CG3_REG_BT458_COLMAP: | 
					
						
							|  |  |  |         val = 0; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case CG3_REG_FBC_CTRL: | 
					
						
							|  |  |  |         val = s->regs[0]; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case CG3_REG_FBC_STATUS: | 
					
						
							|  |  |  |         /* monitor ID 6, board type = 1 (color) */ | 
					
						
							|  |  |  |         val = s->regs[1] | CG3_SR_1152_900_76_B | CG3_SR_ID_COLOR; | 
					
						
							|  |  |  |         break; | 
					
						
							| 
									
										
										
										
											2014-05-24 11:51:50 +01:00
										 |  |  |     case CG3_REG_FBC_CURSTART ... CG3_REG_SIZE - 1: | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |         val = s->regs[addr - 0x10]; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         qemu_log_mask(LOG_UNIMP, | 
					
						
							|  |  |  |                   "cg3: Unimplemented register read " | 
					
						
							|  |  |  |                   "reg 0x%" HWADDR_PRIx " size 0x%x\n", | 
					
						
							|  |  |  |                   addr, size); | 
					
						
							|  |  |  |         val = 0; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     DPRINTF("read %02x from reg %" HWADDR_PRIx "\n", val, addr); | 
					
						
							|  |  |  |     return val; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_reg_write(void *opaque, hwaddr addr, uint64_t val, | 
					
						
							|  |  |  |                           unsigned size) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = opaque; | 
					
						
							|  |  |  |     uint8_t regval; | 
					
						
							|  |  |  |     int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     DPRINTF("write %" PRIx64 " to reg %" HWADDR_PRIx " size %d\n", | 
					
						
							|  |  |  |             val, addr, size); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case CG3_REG_BT458_ADDR: | 
					
						
							|  |  |  |         s->dac_index = val; | 
					
						
							|  |  |  |         s->dac_state = 0; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case CG3_REG_BT458_COLMAP: | 
					
						
							|  |  |  |         /* This register can be written to as either a long word or a byte */ | 
					
						
							|  |  |  |         if (size == 1) { | 
					
						
							|  |  |  |             val <<= 24; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         for (i = 0; i < size; i++) { | 
					
						
							|  |  |  |             regval = val >> 24; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             switch (s->dac_state) { | 
					
						
							|  |  |  |             case 0: | 
					
						
							|  |  |  |                 s->r[s->dac_index] = regval; | 
					
						
							|  |  |  |                 s->dac_state++; | 
					
						
							|  |  |  |                 break; | 
					
						
							|  |  |  |             case 1: | 
					
						
							|  |  |  |                 s->g[s->dac_index] = regval; | 
					
						
							|  |  |  |                 s->dac_state++; | 
					
						
							|  |  |  |                 break; | 
					
						
							|  |  |  |             case 2: | 
					
						
							|  |  |  |                 s->b[s->dac_index] = regval; | 
					
						
							|  |  |  |                 /* Index autoincrement */ | 
					
						
							|  |  |  |                 s->dac_index = (s->dac_index + 1) & 0xff; | 
					
						
							|  |  |  |             default: | 
					
						
							|  |  |  |                 s->dac_state = 0; | 
					
						
							|  |  |  |                 break; | 
					
						
							|  |  |  |             } | 
					
						
							|  |  |  |             val <<= 8; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         s->full_update = 1; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case CG3_REG_FBC_CTRL: | 
					
						
							|  |  |  |         s->regs[0] = val; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     case CG3_REG_FBC_STATUS: | 
					
						
							|  |  |  |         if (s->regs[1] & CG3_SR_PENDING_INT) { | 
					
						
							|  |  |  |             /* clear interrupt */ | 
					
						
							|  |  |  |             s->regs[1] &= ~CG3_SR_PENDING_INT; | 
					
						
							|  |  |  |             qemu_irq_lower(s->irq); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         break; | 
					
						
							| 
									
										
										
										
											2014-05-24 11:51:50 +01:00
										 |  |  |     case CG3_REG_FBC_CURSTART ... CG3_REG_SIZE - 1: | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |         s->regs[addr - 0x10] = val; | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         qemu_log_mask(LOG_UNIMP, | 
					
						
							|  |  |  |                   "cg3: Unimplemented register write " | 
					
						
							|  |  |  |                   "reg 0x%" HWADDR_PRIx " size 0x%x value 0x%" PRIx64 "\n", | 
					
						
							|  |  |  |                   addr, size, val); | 
					
						
							|  |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const MemoryRegionOps cg3_reg_ops = { | 
					
						
							|  |  |  |     .read = cg3_reg_read, | 
					
						
							|  |  |  |     .write = cg3_reg_write, | 
					
						
							|  |  |  |     .endianness = DEVICE_NATIVE_ENDIAN, | 
					
						
							|  |  |  |     .valid = { | 
					
						
							|  |  |  |         .min_access_size = 1, | 
					
						
							|  |  |  |         .max_access_size = 4, | 
					
						
							|  |  |  |     }, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const GraphicHwOps cg3_ops = { | 
					
						
							|  |  |  |     .invalidate = cg3_invalidate_display, | 
					
						
							|  |  |  |     .gfx_update = cg3_update_display, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-05-24 11:42:36 +01:00
										 |  |  | static void cg3_initfn(Object *obj) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     SysBusDevice *sbd = SYS_BUS_DEVICE(obj); | 
					
						
							|  |  |  |     CG3State *s = CG3(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-10-01 10:59:51 +02:00
										 |  |  |     memory_region_init_ram(&s->rom, obj, "cg3.prom", FCODE_MAX_ROM_SIZE, | 
					
						
							| 
									
										
											  
											
												Fix bad error handling after memory_region_init_ram()
Symptom:
    $ qemu-system-x86_64 -m 10000000
    Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
    upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
    Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions.  Before the commit, we report the error and exit(1), in
one place, ram_block_add().  The commit lifts the error handling up
the call chain some, to three places.  Fine.  Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
  Commit 4994653 (right after commit ef701d7) lifted the error
  handling further, through memory_region_init_ram(), multiplying the
  incorrect use of &error_abort.  Later on, imitation of existing
  (bad) code may have created more.
* memory_region_init_ram_ptr()
  The &error_abort is still there.
* memory_region_init_rom_device()
  Doesn't need fixing, because commit 33e0eb5 (soon after commit
  ef701d7) lifted the error handling further, and in the process
  changed it from &error_abort to passing it up the call chain.
  Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
    @r@
    expression mr, owner, name, size, err;
    position p;
    @@
            memory_region_init_ram(mr, owner, name, size,
    (
    -                              &error_abort
    +                              &error_fatal
    |
                                   err@p
    )
                                  );
    @script:python@
        p << r.p;
    @@
    print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal.  This is the fix.
If the last argument is anything else, its position is reported.  This
lets us check the fix is complete.  Four positions get reported:
* ram_backend_memory_alloc()
  Error is passed up the call chain, ultimately through
  user_creatable_complete().  As far as I can tell, it's callers all
  handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
  DeviceClass.realize() methods, errors handled sanely further up the
  call chain.
We're good.  Test case again behaves:
    $ qemu-system-x86_64 -m 10000000
    qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
    [Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
											
										 
											2015-09-11 16:51:43 +02:00
										 |  |  |                            &error_fatal); | 
					
						
							| 
									
										
										
										
											2014-05-24 11:42:36 +01:00
										 |  |  |     memory_region_set_readonly(&s->rom, true); | 
					
						
							|  |  |  |     sysbus_init_mmio(sbd, &s->rom); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-10-01 10:59:51 +02:00
										 |  |  |     memory_region_init_io(&s->reg, obj, &cg3_reg_ops, s, "cg3.reg", | 
					
						
							| 
									
										
										
										
											2014-05-24 11:42:36 +01:00
										 |  |  |                           CG3_REG_SIZE); | 
					
						
							|  |  |  |     sysbus_init_mmio(sbd, &s->reg); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  | static void cg3_realizefn(DeviceState *dev, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     SysBusDevice *sbd = SYS_BUS_DEVICE(dev); | 
					
						
							|  |  |  |     CG3State *s = CG3(dev); | 
					
						
							|  |  |  |     int ret; | 
					
						
							|  |  |  |     char *fcode_filename; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /* FCode ROM */ | 
					
						
							|  |  |  |     vmstate_register_ram_global(&s->rom); | 
					
						
							|  |  |  |     fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, CG3_ROM_FILE); | 
					
						
							|  |  |  |     if (fcode_filename) { | 
					
						
							|  |  |  |         ret = load_image_targphys(fcode_filename, s->prom_addr, | 
					
						
							|  |  |  |                                   FCODE_MAX_ROM_SIZE); | 
					
						
							| 
									
										
										
										
											2015-05-28 19:13:42 +08:00
										 |  |  |         g_free(fcode_filename); | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |         if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) { | 
					
						
							|  |  |  |             error_report("cg3: could not load prom '%s'", CG3_ROM_FILE); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-09-09 13:27:55 +08:00
										 |  |  |     memory_region_init_ram(&s->vram_mem, NULL, "cg3.vram", s->vram_size, | 
					
						
							| 
									
										
											  
											
												Fix bad error handling after memory_region_init_ram()
Symptom:
    $ qemu-system-x86_64 -m 10000000
    Unexpected error in ram_block_add() at /work/armbru/qemu/exec.c:1456:
    upstream-qemu: cannot set up guest memory 'pc.ram': Cannot allocate memory
    Aborted (core dumped)
Root cause: commit ef701d7 screwed up handling of out-of-memory
conditions.  Before the commit, we report the error and exit(1), in
one place, ram_block_add().  The commit lifts the error handling up
the call chain some, to three places.  Fine.  Except it uses
&error_abort in these places, changing the behavior from exit(1) to
abort(), and thus undoing the work of commit 3922825 "exec: Don't
abort when we can't allocate guest memory".
The three places are:
* memory_region_init_ram()
  Commit 4994653 (right after commit ef701d7) lifted the error
  handling further, through memory_region_init_ram(), multiplying the
  incorrect use of &error_abort.  Later on, imitation of existing
  (bad) code may have created more.
* memory_region_init_ram_ptr()
  The &error_abort is still there.
* memory_region_init_rom_device()
  Doesn't need fixing, because commit 33e0eb5 (soon after commit
  ef701d7) lifted the error handling further, and in the process
  changed it from &error_abort to passing it up the call chain.
  Correct, because the callers are realize() methods.
Fix the error handling after memory_region_init_ram() with a
Coccinelle semantic patch:
    @r@
    expression mr, owner, name, size, err;
    position p;
    @@
            memory_region_init_ram(mr, owner, name, size,
    (
    -                              &error_abort
    +                              &error_fatal
    |
                                   err@p
    )
                                  );
    @script:python@
        p << r.p;
    @@
    print "%s:%s:%s" % (p[0].file, p[0].line, p[0].column)
When the last argument is &error_abort, it gets replaced by
&error_fatal.  This is the fix.
If the last argument is anything else, its position is reported.  This
lets us check the fix is complete.  Four positions get reported:
* ram_backend_memory_alloc()
  Error is passed up the call chain, ultimately through
  user_creatable_complete().  As far as I can tell, it's callers all
  handle the error sanely.
* fsl_imx25_realize(), fsl_imx31_realize(), dp8393x_realize()
  DeviceClass.realize() methods, errors handled sanely further up the
  call chain.
We're good.  Test case again behaves:
    $ qemu-system-x86_64 -m 10000000
    qemu-system-x86_64: cannot set up guest memory 'pc.ram': Cannot allocate memory
    [Exit 1 ]
The next commits will repair the rest of commit ef701d7's damage.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1441983105-26376-3-git-send-email-armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
											
										 
											2015-09-11 16:51:43 +02:00
										 |  |  |                            &error_fatal); | 
					
						
							| 
									
										
										
										
											2015-03-23 10:47:45 +01:00
										 |  |  |     memory_region_set_log(&s->vram_mem, true, DIRTY_MEMORY_VGA); | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |     vmstate_register_ram_global(&s->vram_mem); | 
					
						
							|  |  |  |     sysbus_init_mmio(sbd, &s->vram_mem); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     sysbus_init_irq(sbd, &s->irq); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-01-24 15:35:21 +01:00
										 |  |  |     s->con = graphic_console_init(DEVICE(dev), 0, &cg3_ops, s); | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |     qemu_console_resize(s->con, s->width, s->height); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int vmstate_cg3_post_load(void *opaque, int version_id) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = opaque; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     cg3_invalidate_display(s); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const VMStateDescription vmstate_cg3 = { | 
					
						
							|  |  |  |     .name = "cg3", | 
					
						
							|  |  |  |     .version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id = 1, | 
					
						
							|  |  |  |     .post_load = vmstate_cg3_post_load, | 
					
						
							| 
									
										
										
										
											2014-04-16 16:01:33 +02:00
										 |  |  |     .fields = (VMStateField[]) { | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |         VMSTATE_UINT16(height, CG3State), | 
					
						
							|  |  |  |         VMSTATE_UINT16(width, CG3State), | 
					
						
							|  |  |  |         VMSTATE_UINT16(depth, CG3State), | 
					
						
							|  |  |  |         VMSTATE_BUFFER(r, CG3State), | 
					
						
							|  |  |  |         VMSTATE_BUFFER(g, CG3State), | 
					
						
							|  |  |  |         VMSTATE_BUFFER(b, CG3State), | 
					
						
							|  |  |  |         VMSTATE_UINT8(dac_index, CG3State), | 
					
						
							|  |  |  |         VMSTATE_UINT8(dac_state, CG3State), | 
					
						
							|  |  |  |         VMSTATE_END_OF_LIST() | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_reset(DeviceState *d) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     CG3State *s = CG3(d); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     /* Initialize palette */ | 
					
						
							|  |  |  |     memset(s->r, 0, 256); | 
					
						
							|  |  |  |     memset(s->g, 0, 256); | 
					
						
							|  |  |  |     memset(s->b, 0, 256); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     s->dac_state = 0; | 
					
						
							|  |  |  |     s->full_update = 1; | 
					
						
							|  |  |  |     qemu_irq_lower(s->irq); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static Property cg3_properties[] = { | 
					
						
							|  |  |  |     DEFINE_PROP_UINT32("vram-size",    CG3State, vram_size, -1), | 
					
						
							|  |  |  |     DEFINE_PROP_UINT16("width",        CG3State, width,     -1), | 
					
						
							|  |  |  |     DEFINE_PROP_UINT16("height",       CG3State, height,    -1), | 
					
						
							|  |  |  |     DEFINE_PROP_UINT16("depth",        CG3State, depth,     -1), | 
					
						
							|  |  |  |     DEFINE_PROP_UINT64("prom-addr",    CG3State, prom_addr, -1), | 
					
						
							|  |  |  |     DEFINE_PROP_END_OF_LIST(), | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_class_init(ObjectClass *klass, void *data) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     DeviceClass *dc = DEVICE_CLASS(klass); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     dc->realize = cg3_realizefn; | 
					
						
							|  |  |  |     dc->reset = cg3_reset; | 
					
						
							|  |  |  |     dc->vmsd = &vmstate_cg3; | 
					
						
							|  |  |  |     dc->props = cg3_properties; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const TypeInfo cg3_info = { | 
					
						
							|  |  |  |     .name          = TYPE_CG3, | 
					
						
							|  |  |  |     .parent        = TYPE_SYS_BUS_DEVICE, | 
					
						
							|  |  |  |     .instance_size = sizeof(CG3State), | 
					
						
							| 
									
										
										
										
											2014-05-24 11:42:36 +01:00
										 |  |  |     .instance_init = cg3_initfn, | 
					
						
							| 
									
										
										
										
											2013-10-15 21:03:04 +01:00
										 |  |  |     .class_init    = cg3_class_init, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void cg3_register_types(void) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     type_register_static(&cg3_info); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | type_init(cg3_register_types) |