diff options
| author | Alon Levy <alevy@redhat.com> | 2011-07-22 01:26:57 +0300 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-07-23 00:55:03 +0300 |
| commit | e289df207b63064d10455fec6e406171711605d5 (patch) | |
| tree | f51a189442d66bef75865760b964dfc57ec8c977 | |
| parent | e36912352b34f711dedc007d9b07eff8427bf5d0 (diff) | |
spiceqxl_io_port: s/init_qxl_ram/xspice_init_qxl_ram/
| -rw-r--r-- | src/qxl_driver.c | 2 | ||||
| -rw-r--r-- | src/spiceqxl_io_port.c | 4 | ||||
| -rw-r--r-- | src/spiceqxl_io_port.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qxl_driver.c b/src/qxl_driver.c index cf30434..f0d6541 100644 --- a/src/qxl_driver.c +++ b/src/qxl_driver.c @@ -1331,7 +1331,7 @@ qxl_pre_init(ScrnInfoPtr pScrn, int flags) if (!qxl_check_device(pScrn, qxl)) goto out; #else - init_qxl_ram(qxl); /* initialize the rings */ + xspice_init_qxl_ram(qxl); /* initialize the rings */ #endif pScrn->videoRam = (qxl->rom->num_pages * 4096) / 1024; xf86DrvMsg(scrnIndex, X_INFO, "%d KB of video RAM\n", pScrn->videoRam); diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c index 2139c86..2c95091 100644 --- a/src/spiceqxl_io_port.c +++ b/src/spiceqxl_io_port.c @@ -39,7 +39,7 @@ static int spiceqxl_io_port_debug_level = 5; } \ } while (0) -void init_qxl_ram(qxl_screen_t *qxl) +void xspice_init_qxl_ram(qxl_screen_t *qxl) { QXLRam *ram = get_ram_header(qxl); uint64_t *item; @@ -62,7 +62,7 @@ static void qxl_reset_state(qxl_screen_t *qxl) assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring)); qxl->shadow_rom.update_id = 0; *qxl->rom = qxl->shadow_rom; - init_qxl_ram(qxl); + xspice_init_qxl_ram(qxl); qxl->num_free_res = 0; qxl->last_release = NULL; // TODO - dirty ? diff --git a/src/spiceqxl_io_port.h b/src/spiceqxl_io_port.h index f442773..839ded6 100644 --- a/src/spiceqxl_io_port.h +++ b/src/spiceqxl_io_port.h @@ -5,6 +5,6 @@ /* used to initialize the rings before the first reset, avoid a valgrind * warning */ -void init_qxl_ram(qxl_screen_t *qxl); +void xspice_init_qxl_ram(qxl_screen_t *qxl); #endif // SPICEQXL_IO_PORT_H |