Commit 93156cef authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-04-28' into staging 



trivial patches for 2014-04-28

# gpg: Signature made Mon 28 Apr 2014 05:56:01 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-04-28:
  slirp/smb: Move ncalrpc directory to tmp
  po: add proper Language: tags to .po files
  po/Makefile: fix $SRC_PATH reference
  init_paths: fix minor memory leak
  virtfs-proxy-helper: fix call to accept
  net/net.c: remove unnecessary semicolon
  Add QEMU logo (SVG file)
  vl: avoid closing stdout with 'writeconfig'
  xilinx: Fix typo in comment (Marvel -> Marvell)
  vl: Eliminate a superfluous local variable
  vl: Remove useless 'continue'
  gitignore: cleanups #2
  tests/.gitignore: Ignore test-rfifolock
  move test-* from .gitignore to tests/.gitignore
  configure: Improve help behavior
  vl: convert -m to QemuOpts
  qemu-option: introduce qemu_find_opts_singleton
  misc: Use cpu_physical_memory_read and cpu_physical_memory_write

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 13de54ee b87b8a8b

.gitignore

+2 −16
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
/*-darwin-user

/*-linux-user

/*-bsd-user

libdis*

libuser

/libdis*

/libuser

/linux-headers/asm

/qga/qapi-generated

/qapi-generated
@@ -49,19 +49,9 @@ libuser 
/qemu-monitor.texi

/qmp-commands.txt

/vscclient

/test-bitops

/test-coroutine

/test-int128

/test-opts-visitor

/test-qmp-input-visitor

/test-qmp-output-visitor

/test-string-input-visitor

/test-string-output-visitor

/test-visitor-serialization

/fsdev/virtfs-proxy-helper

/fsdev/virtfs-proxy-helper.1

/fsdev/virtfs-proxy-helper.pod

/.gdbinit

*.a

*.aux

*.cp
@@ -90,12 +80,8 @@ libuser 
*.pc

.libs

.sdk

*.swp

*.orig

.pc

*.gcda

*.gcno

patches

/pc-bios/bios-pq/status

/pc-bios/vgabios-pq/status

/pc-bios/optionrom/linuxboot.asm

configure

+5 −2
Original line number Diff line number Diff line
@@ -1087,7 +1087,10 @@ for opt do 
  ;;

  --enable-quorum) quorum="yes"

  ;;

  *) echo "ERROR: unknown option $opt"; show_help="yes"

  *)

      echo "ERROR: unknown option $opt"

      echo "Try '$0 --help' for more information"

      exit 1

  ;;

  esac

done
@@ -1353,7 +1356,7 @@ Advanced options (experts only): 


NOTE: The object files are built at the place where configure is launched

EOF

exit 1

exit 0

fi



# Now we have handled --enable-tcg-interpreter and know we're not just

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, 
        l = sizeof(buf);

        if (l > size)

            l = size;

        cpu_physical_memory_rw(addr, buf, l, 0);

        cpu_physical_memory_read(addr, buf, l);

        if (fwrite(buf, 1, l, f) != l) {

            error_set(errp, QERR_IO_ERROR);

            goto exit;

fsdev/virtfs-proxy-helper.c

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid) 
        return -1;

    }



    size = sizeof(qemu);

    client = accept(sock, (struct sockaddr *)&qemu, &size);

    if (client < 0) {

        do_perror("accept");

hw/i386/kvmvapic.c

+14 −17
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ static const TPRInstruction tpr_instr[] = { 


static void read_guest_rom_state(VAPICROMState *s)

{

    cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,

                           sizeof(GuestROMState), 0);

    cpu_physical_memory_read(s->rom_state_paddr, &s->rom_state,

                             sizeof(GuestROMState));

}



static void write_guest_rom_state(VAPICROMState *s)

{

    cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,

                           sizeof(GuestROMState), 1);

    cpu_physical_memory_write(s->rom_state_paddr, &s->rom_state,

                              sizeof(GuestROMState));

}



static void update_guest_rom_state(VAPICROMState *s)
@@ -311,16 +311,14 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i 
    for (pos = le32_to_cpu(s->rom_state.fixup_start);

         pos < le32_to_cpu(s->rom_state.fixup_end);

         pos += 4) {

        cpu_physical_memory_rw(paddr + pos - s->rom_state.vaddr,

                               (void *)&offset, sizeof(offset), 0);

        cpu_physical_memory_read(paddr + pos - s->rom_state.vaddr,

                                 &offset, sizeof(offset));

        offset = le32_to_cpu(offset);

        cpu_physical_memory_rw(paddr + offset, (void *)&patch,

                               sizeof(patch), 0);

        cpu_physical_memory_read(paddr + offset, &patch, sizeof(patch));

        patch = le32_to_cpu(patch);

        patch += rom_state_vaddr - le32_to_cpu(s->rom_state.vaddr);

        patch = cpu_to_le32(patch);

        cpu_physical_memory_rw(paddr + offset, (void *)&patch,

                               sizeof(patch), 1);

        cpu_physical_memory_write(paddr + offset, &patch, sizeof(patch));

    }

    read_guest_rom_state(s);

    s->vapic_paddr = paddr + le32_to_cpu(s->rom_state.vapic_vaddr) -
@@ -364,8 +362,8 @@ static int vapic_enable(VAPICROMState *s, X86CPU *cpu) 
    }

    vapic_paddr = s->vapic_paddr +

        (((hwaddr)cpu_number) << VAPIC_CPU_SHIFT);

    cpu_physical_memory_rw(vapic_paddr + offsetof(VAPICState, enabled),

                           (void *)&enabled, sizeof(enabled), 1);

    cpu_physical_memory_write(vapic_paddr + offsetof(VAPICState, enabled),

                              &enabled, sizeof(enabled));

    apic_enable_vapic(cpu->apic_state, vapic_paddr);



    s->state = VAPIC_ACTIVE;
@@ -535,7 +533,7 @@ static int patch_hypercalls(VAPICROMState *s) 
    uint8_t *rom;



    rom = g_malloc(s->rom_size);

    cpu_physical_memory_rw(rom_paddr, rom, s->rom_size, 0);

    cpu_physical_memory_read(rom_paddr, rom, s->rom_size);



    for (pos = 0; pos < s->rom_size - sizeof(vmcall_pattern); pos++) {

        if (kvm_irqchip_in_kernel()) {
@@ -551,8 +549,7 @@ static int patch_hypercalls(VAPICROMState *s) 
        }

        if (memcmp(rom + pos, pattern, 7) == 0 &&

            (rom[pos + 7] == alternates[0] || rom[pos + 7] == alternates[1])) {

            cpu_physical_memory_rw(rom_paddr + pos + 5, (uint8_t *)patch,

                                   3, 1);

            cpu_physical_memory_write(rom_paddr + pos + 5, patch, 3);

            /*

             * Don't flush the tb here. Under ordinary conditions, the patched

             * calls are miles away from the current IP. Under malicious
@@ -760,8 +757,8 @@ static int vapic_post_load(void *opaque, int version_id) 
            run_on_cpu(first_cpu, do_vapic_enable, s);

        } else {

            zero = g_malloc0(s->rom_state.vapic_size);

            cpu_physical_memory_rw(s->vapic_paddr, zero,

                                   s->rom_state.vapic_size, 1);

            cpu_physical_memory_write(s->vapic_paddr, zero,

                                      s->rom_state.vapic_size);

            g_free(zero);

        }

    }