[Qemu-commits] [qemu/qemu] c08295: cpu: Add missing documentation for some CPUClass m...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c08295d4bf161332f3f0b34b378138592a26245a
      
https://github.com/qemu/qemu/commit/c08295d4bf161332f3f0b34b378138592a26245a
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M include/qom/cpu.h

  Log Message:
  -----------
  cpu: Add missing documentation for some CPUClass methods

The CPUClass QOM methods virtio_is_big_endian, write_elf{32,64}_note
and write_elf{32,64}_qemunote were added without any description
being added to the doc comment. Correct this omission.

Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 6e8e26519901bc254a0db2e8aad805c4349cd3b4
      
https://github.com/qemu/qemu/commit/6e8e26519901bc254a0db2e8aad805c4349cd3b4
  Author: Markus Armbruster <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Clean up misuse of qdev_init() in realize method

x86_cpu_apic_realize() calls qdev_init() to realize the APIC.
qdev_init()'s error handling has unwanted side effects: it unparents
the device, and it calls qerror_report_err().

qerror_report_err() is always inappropriate in realize methods,
because it doesn't return the Error object.  It either reports the
error to stderr or the human monitor, or it stores it in the QMP
monitor, where it makes the QMP command fail even though the realize
method succeeded.

Fortunately, qdev_init() can't actually fail here, because realize
can't fail for any of the three possible APIC device models.

Clean up by cutting out the qdev_init() middle-man: set property
"realized" directly.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 41979669ab756791cebc1a20c6a6ee1cb7c71caa
      
https://github.com/qemu/qemu/commit/41979669ab756791cebc1a20c6a6ee1cb7c71caa
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M target-unicore32/cpu.h
    M target-unicore32/helper.c

  Log Message:
  -----------
  target-unicore32: Make uc32_cpu_init() return UniCore32CPU

This way, the cpu_init() function in target-unicore32 will follow the
same pattern used on all other architectures.

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


  Commit: eeff620f820f9f0a4f400dec1437bc251402051a
      
https://github.com/qemu/qemu/commit/eeff620f820f9f0a4f400dec1437bc251402051a
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M hw/m68k/dummy_m68k.c

  Log Message:
  -----------
  m68k: Use cpu_m68k_init()

Instead of using the legacy cpu_init() function, use cpu_m68k_init()
directly to create a M68kCPU object.

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


  Commit: c3898f770bffd6be5c1558abeaca9cd1fb18b6ca
      
https://github.com/qemu/qemu/commit/c3898f770bffd6be5c1558abeaca9cd1fb18b6ca
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M hw/unicore32/puv3.c

  Log Message:
  -----------
  unicore32: Use uc32_cpu_init()

Instead of using the legacy cpu_init() function, use uc32_cpu_init() to
create a UniCore32CPU object.

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


  Commit: 2994fd96d986578a342f2342501b4ad30f6d0a85
      
https://github.com/qemu/qemu/commit/2994fd96d986578a342f2342501b4ad30f6d0a85
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

  Changed paths:
    M bsd-user/main.c
    M linux-user/main.c
    M target-alpha/cpu.h
    M target-arm/cpu.h
    M target-cris/cpu.h
    M target-i386/cpu.h
    M target-lm32/cpu.h
    M target-m68k/cpu.h
    M target-microblaze/cpu.h
    M target-mips/cpu.h
    M target-moxie/cpu.h
    M target-openrisc/cpu.h
    M target-ppc/cpu.h
    M target-s390x/cpu.h
    M target-sh4/cpu.h
    M target-sparc/cpu.h
    M target-tricore/cpu.h
    M target-unicore32/cpu.h
    M target-xtensa/cpu.h

  Log Message:
  -----------
  cpu: Make cpu_init() return QOM CPUState object

Instead of making cpu_init() return CPUArchState, return CPUState.

Changes were made using the Coccinelle semantic patch below.

  @@
  typedef CPUState;
  identifier e;
  expression args;
  type CPUArchState;
  @@
  -   e =
  +   cpu =
    cpu_init(args);
  -   if (!e) {
  +   if (!cpu) {
    ...
      }
  -   cpu = ENV_GET_CPU(env);
  +   e = cpu->env_ptr;

  @@
  identifier new_env, new_cpu, env, cpu;
  type CPUArchState;
  expression args;
  @@
  -{
  -   CPUState *cpu = ENV_GET_CPU(env);
  -   CPUArchState *new_env = cpu_init(args);
  -   CPUState *new_cpu = ENV_GET_CPU(new_env);
  +{
  +   CPUState *cpu = ENV_GET_CPU(env);
  +   CPUState *new_cpu = cpu_init(args);
  +   CPUArchState *new_env = new_cpu->env_ptr;
      ...
  }

  @@
  identifier c, cpu_init_func, cpu_model;
  type StateType, CPUType;
  @@
  -static inline StateType* cpu_init(const char *cpu_model)
  -{
  -   CPUType *c = cpu_init_func(cpu_model);
  (
  -   if (c == NULL) {
  -       return NULL;
  -   }
  -   return &c->env;
  |
  -   if (c) {
  -       return &c->env;
  -   }
  -   return NULL;
  )
  -}
  +#define cpu_init(cpu_model) CPU(cpu_init_func(cpu_model))

  @@
  identifier cpu_init_func;
  identifier model;
  @@
  -#define cpu_init(model) (&cpu_init_func(model)->env)
  +#define cpu_init(model) CPU(cpu_init_func(model))

Signed-off-by: Eduardo Habkost <address@hidden>
Cc: Blue Swirl <address@hidden>
Cc: Guan Xuetao <address@hidden>
Cc: Riku Voipio <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: "Edgar E. Iglesias" <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Michael Walle <address@hidden>
Cc: Aurelien Jarno <address@hidden>
Cc: Leon Alrae <address@hidden>
Cc: Anthony Green <address@hidden>
Cc: Jia Liu <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: Bastian Koppelmann <address@hidden>
Cc: Max Filippov <address@hidden>
[AF: Fixed up cpu_copy() manually]
Signed-off-by: Andreas Färber <address@hidden>


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

  Changed paths:
    M bsd-user/main.c
    M hw/m68k/dummy_m68k.c
    M hw/unicore32/puv3.c
    M include/qom/cpu.h
    M linux-user/main.c
    M target-alpha/cpu.h
    M target-arm/cpu.h
    M target-cris/cpu.h
    M target-i386/cpu.c
    M target-i386/cpu.h
    M target-lm32/cpu.h
    M target-m68k/cpu.h
    M target-microblaze/cpu.h
    M target-mips/cpu.h
    M target-moxie/cpu.h
    M target-openrisc/cpu.h
    M target-ppc/cpu.h
    M target-s390x/cpu.h
    M target-sh4/cpu.h
    M target-sparc/cpu.h
    M target-tricore/cpu.h
    M target-unicore32/cpu.h
    M target-unicore32/helper.c
    M target-xtensa/cpu.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter' into 
staging

QOM CPUState and X86CPU

* Add CPUClass documentation
* Clean up X86CPU APIC realization
* Cleanups around cpu_init()

# gpg: Signature made Tue Mar 10 17:27:28 2015 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <address@hidden>"
# gpg:                 aka "Andreas Färber <address@hidden>"

* remotes/afaerber/tags/qom-cpu-for-peter:
  cpu: Make cpu_init() return QOM CPUState object
  unicore32: Use uc32_cpu_init()
  m68k: Use cpu_m68k_init()
  target-unicore32: Make uc32_cpu_init() return UniCore32CPU
  target-i386: Clean up misuse of qdev_init() in realize method
  cpu: Add missing documentation for some CPUClass methods

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


Compare: https://github.com/qemu/qemu/compare/48412371415a...8d86e34e65d6