[Qemu-commits] [qemu/qemu] 869b76: target-i386: Move topology.h to include/hw/i386

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 869b7649b534b51dd9e6ddbbdeb7397e083f527f
      
https://github.com/qemu/qemu/commit/869b7649b534b51dd9e6ddbbdeb7397e083f527f
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    A include/hw/i386/topology.h
    M target-i386/cpu.c
    R target-i386/topology.h
    M tests/Makefile
    M tests/test-x86-cpuid.c

  Log Message:
  -----------
  target-i386: Move topology.h to include/hw/i386

This will allow the PC code to use the header, and lets us eliminate the
QEMU_INCLUDES hack inside tests/Makefile.

Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 8c3329e50ad74245acbea89bdaa8af12ecf4972c
      
https://github.com/qemu/qemu/commit/8c3329e50ad74245acbea89bdaa8af12ecf4972c
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Simplify listflags() function

listflags() had lots of unnecessary complexity. Instead of printing to a
buffer that will be immediately printed, simply call the printing
function directly. Also, remove the fbits and flags arguments that were
always set to the same value. Also, there's no need to list the flags in
reverse order.

Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 5eb2f7a4df03b53f7eaf56d2dd53d75328909826
      
https://github.com/qemu/qemu/commit/5eb2f7a4df03b53f7eaf56d2dd53d75328909826
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Eliminate unnecessary get_cpuid_vendor() function

The function was used in only two places. In one of them, the function
made the code less readable by requiring temporary te[bcd]x variables.
In the other one we can simply inline the existing code.

Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 0f4b210e504d7db42b96882e94481f444e420fe3
      
https://github.com/qemu/qemu/commit/0f4b210e504d7db42b96882e94481f444e420fe3
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Remove unused APIC ID default code

The existing apic_id = cpu_index code has no visible effect: the PC code
already initializes the APIC ID according to the topology on
pc_new_cpu(), and linux-user memcpy()s the CPU state (including
cpuid_apic_id) on cpu_copy().

Remove the dead code and simply let APIC ID to to be 0 by default. This
doesn't change behavior of PC because apic-id is already explicitly set,
and doesn't affect linux-user because APIC ID was already always 0.

Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 7e72a45c99fccfe5586d7c4e2f7441f28e24e450
      
https://github.com/qemu/qemu/commit/7e72a45c99fccfe5586d7c4e2f7441f28e24e450
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M target-i386/cpu-qom.h
    M target-i386/cpu.c
    M target-i386/cpu.h
    M target-i386/kvm.c

  Log Message:
  -----------
  target-i386: Move CPUX86State::cpuid_apic_id to X86CPU::apic_id

The field doesn't need to be inside CPUX86State, and it is not specific
for the CPUID instruction, so move and rename it.

Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 54a402930ac6d1a9d6d402229ae8ba8bef7e598e
      
https://github.com/qemu/qemu/commit/54a402930ac6d1a9d6d402229ae8ba8bef7e598e
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M hw/i386/pc.c
    M target-i386/cpu.c
    M target-i386/cpu.h

  Log Message:
  -----------
  target-i386: Move APIC ID compatibility code to pc.c

The APIC ID compatibility code is required only for PC, and now that
x86_cpu_initfn() doesn't use x86_cpu_apic_id_from_index() anymore, that
code can be moved to pc.c.

Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 9886e834f47adabdbfd54ab606788ce7326e6779
      
https://github.com/qemu/qemu/commit/9886e834f47adabdbfd54ab606788ce7326e6779
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M target-i386/cpu-qom.h
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Require APIC ID to be explicitly set before CPU realize

On softmuu, instead of setting APIC ID automatically when creating a
X86CPU, require the property to be set before realizing the object
(which is already done by the CPU creation code on PC).

Keep apic_id = 0 by default on *-user so it can simply create a new CPU
object and realize it without extra steps (so target-i386 will be able
to use cpu_generic_init() eventually).

Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 48412371415a260d00fc7fdcdb400da55f268828
      
https://github.com/qemu/qemu/commit/48412371415a260d00fc7fdcdb400da55f268828
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hw/i386/pc.c
    A include/hw/i386/topology.h
    M target-i386/cpu-qom.h
    M target-i386/cpu.c
    M target-i386/cpu.h
    M target-i386/kvm.c
    R target-i386/topology.h
    M tests/Makefile
    M tests/test-x86-cpuid.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into 
staging

X86 patches queued in the last few weeks. Mostly code cleanup and changes on
code assigning APIC ID.

# gpg: Signature made Mon Mar  9 20:40:38 2015 GMT using RSA key ID 984DC5A6
# gpg: Can't check signature: public key not found

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: Require APIC ID to be explicitly set before CPU realize
  target-i386: Move APIC ID compatibility code to pc.c
  target-i386: Move CPUX86State::cpuid_apic_id to X86CPU::apic_id
  target-i386: Remove unused APIC ID default code
  target-i386: Eliminate unnecessary get_cpuid_vendor() function
  target-i386: Simplify listflags() function
  target-i386: Move topology.h to include/hw/i386

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4ba4df405c76...48412371415a