Commit 396a14a3 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

Merge branch 'trivial-patches' of git://github.com/stefanha/qemu 

* 'trivial-patches' of git://github.com/stefanha/qemu:
  cpu-exec: Allow "-d exec" in non-debug builds (drop CONFIG_DEBUG_EXEC)
  Typo, spelling and grammatical fixes
  linux-user: pass correct host flags to eventfd2 call
  target-moxie: Fix VMState registration
parents 0a9c2341 c30d1aea

configure

+0 −3
Original line number Diff line number Diff line
@@ -3471,9 +3471,6 @@ echo "ARCH=$ARCH" >> $config_host_mak 
if test "$debug_tcg" = "yes" ; then

  echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak

fi

if test "$debug" = "yes" ; then

  echo "CONFIG_DEBUG_EXEC=y" >> $config_host_mak

fi

if test "$strip_opt" = "yes" ; then

  echo "STRIP=${strip}" >> $config_host_mak

fi

cpu-exec.c

+6 −9
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include "qemu/atomic.h"

#include "sysemu/qtest.h"



//#define CONFIG_DEBUG_EXEC



bool qemu_cpu_has_work(CPUState *cpu)

{

    return cpu_has_work(cpu);
@@ -567,7 +565,7 @@ int cpu_exec(CPUArchState *env) 
                    env->exception_index = EXCP_INTERRUPT;

                    cpu_loop_exit(env);

                }

#if defined(DEBUG_DISAS) || defined(CONFIG_DEBUG_EXEC)

#if defined(DEBUG_DISAS)

                if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) {

                    /* restore flags in standard format */

#if defined(TARGET_I386)
@@ -582,7 +580,7 @@ int cpu_exec(CPUArchState *env) 
                    log_cpu_state(env, 0);

#endif

                }

#endif /* DEBUG_DISAS || CONFIG_DEBUG_EXEC */

#endif /* DEBUG_DISAS */

                spin_lock(&tcg_ctx.tb_ctx.tb_lock);

                tb = tb_find_fast(env);

                /* Note: we do it here to avoid a gcc bug on Mac OS X when
@@ -594,11 +592,10 @@ int cpu_exec(CPUArchState *env) 
                    next_tb = 0;

                    tcg_ctx.tb_ctx.tb_invalidated_flag = 0;

                }

#ifdef CONFIG_DEBUG_EXEC

                qemu_log_mask(CPU_LOG_EXEC, "Trace %p [" TARGET_FMT_lx "] %s\n",

                             tb->tc_ptr, tb->pc,

                             lookup_symbol(tb->pc));

#endif

                if (qemu_loglevel_mask(CPU_LOG_EXEC)) {

                    qemu_log("Trace %p [" TARGET_FMT_lx "] %s\n",

                             tb->tc_ptr, tb->pc, lookup_symbol(tb->pc));

                }

                /* see if we can patch the calling TB. When the TB

                   spans two pages, we cannot safely do a direct

                   jump. */

docs/bootindex.txt

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ still be bootable. 


== Example ==



Lets assume we have QEMU machine with two NICs (virtio, e1000) and two

Let's assume we have a QEMU machine with two NICs (virtio, e1000) and two

disks (IDE, virtio):



qemu -drive file=disk1.img,if=none,id=disk1
@@ -20,7 +20,7 @@ qemu -drive file=disk1.img,if=none,id=disk1 
     -netdev type=user,id=net1 -device e1000,netdev=net1,bootindex=1



Given the command above, firmware should try to boot from the e1000 NIC

first.  If this fails, it should try the virtio NIC next, if this fails

first.  If this fails, it should try the virtio NIC next; if this fails

too, it should try the virtio disk, and then the IDE disk.



== Limitations ==
@@ -28,7 +28,7 @@ too, it should try the virtio disk, and then the IDE disk. 
1. Some firmware has limitations on which devices can be considered for

booting.  For instance, the PC BIOS boot specification allows only one

disk to be bootable.  If boot from disk fails for some reason, the BIOS

won't retry booting from other disk.  It still can try to boot from

won't retry booting from other disk.  It can still try to boot from

floppy or net, though.



2. Sometimes, firmware cannot map the device path QEMU wants firmware to
@@ -36,8 +36,8 @@ boot from to a boot method. It doesn't happen for devices the firmware 
can natively boot from, but if firmware relies on an option ROM for

booting, and the same option ROM is used for booting from more then one

device, the firmware may not be able to ask the option ROM to boot from

a particular device reliably.  For instance with PC BIOS, if a SCSI HBA

a particular device reliably.  For instance with the PC BIOS, if a SCSI HBA

has three bootable devices target1, target3, target5 connected to it,

the option ROM will have a boot method for each of them, but it is not

possible to map from boot method back to a specific target.  This is a

shortcoming of PC BIOS boot specification.
 
shortcoming of the PC BIOS boot specification.

docs/ccid.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ information see the specification: 
 Revision 1.1

 April 22rd, 2005



Smartcard are used for authentication, single sign on, decryption in

Smartcards are used for authentication, single sign on, decryption in

public/private schemes and digital signatures. A smartcard reader on the client

cannot be used on a guest with simple usb passthrough since it will then not be

available on the client, possibly locking the computer when it is "removed". On

hw/block/virtio-blk.c

+2 −2
Original line number Diff line number Diff line
@@ -494,10 +494,10 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) 
    blkcfg.heads = s->conf->heads;

    /*

     * We must ensure that the block device capacity is a multiple of

     * the logical block size. If that is not the case, lets use

     * the logical block size. If that is not the case, let's use

     * sector_mask to adopt the geometry to have a correct picture.

     * For those devices where the capacity is ok for the given geometry

     * we dont touch the sector value of the geometry, since some devices

     * we don't touch the sector value of the geometry, since some devices

     * (like s390 dasd) need a specific value. Here the capacity is already

     * cyls*heads*secs*blk_size and the sector value is not block size

     * divided by 512 - instead it is the amount of blk_size blocks