← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to darwin-user/commpage.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
darwin-user/commpage.c
15
15
 *
16
16
 *  You should have received a copy of the GNU General Public License
17
17
 *  along with this program; if not, write to the Free Software
18
 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
18
 *  Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 
19
 *  MA 02110-1301, USA.
19
20
 */
20
21
#include <fcntl.h>
21
22
#include <stdio.h>
34
35
//#define DEBUG_COMMPAGE
35
36
 
36
37
#ifdef DEBUG_COMMPAGE
37
 
# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); printf(__VA_ARGS__); } while(0)
 
38
# define DPRINTF(...) do { qemu_log(__VA_ARGS__); printf(__VA_ARGS__); } while(0)
38
39
#else
39
 
# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); } while(0)
 
40
# define DPRINTF(...) do { qemu_log(__VA_ARGS__); } while(0)
40
41
#endif
41
42
 
42
43
/********************************************************************
180
181
 */
181
182
void commpage_init(void)
182
183
{
183
 
#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(__powerpc__) ^ defined(TARGET_PPC))
 
184
#if (defined(__i386__) ^ defined(TARGET_I386)) || (defined(_ARCH_PPC) ^ defined(TARGET_PPC))
184
185
    int i;
185
186
    void * commpage = (void *)target_mmap( COMMPAGE_START, COMMPAGE_SIZE,
186
187
                           PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_FIXED, -1, 0);
191
192
 
192
193
    /* XXX: commpage data not handled */
193
194
 
194
 
    for(i = 0; i < sizeof(commpage_entries)/sizeof(commpage_entries[0]); i++)
 
195
    for(i = 0; i < ARRAY_SIZE(commpage_entries); i++)
195
196
        install_commpage_backdoor_for_entry(commpage_entries[i]);
196
197
#else
197
198
    /* simply map our pages so they can be executed
329
330
 
330
331
    num = num-COMMPAGE_START-2;
331
332
 
332
 
    for(i = 0; i < sizeof(commpage_entries)/sizeof(commpage_entries[0]); i++) {
 
333
    for(i = 0; i < ARRAY_SIZE(commpage_entries); i++) {
333
334
        if( num == commpage_code_num(&commpage_entries[i]) )
334
335
        {
335
336
            DPRINTF("commpage: %s %s\n", commpage_entries[i].name, commpage_is_indirect(&commpage_entries[i]) ? "[indirect]" : "[direct]");