Commit 237e4f92 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging 

QOM CPUState refactorings / X86CPU

* gdbstub coprocessor register count bugfix
* QOM instance_post_init infrastructure to override dynamic properties
* X86CPU HyperV preparations for CPU subclasses

# gpg: Signature made Fri 16 Aug 2013 11:49:02 AM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Eduardo Habkost (3) and others
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  cpus: Use cpu_is_stopped() efficiently
  target-i386: Move hyperv_* static globals to X86CPU
  qdev: Set globals in instance_post_init function
  qom: Introduce instance_post_init hook
  tests: Unit tests for qdev global properties handling
  gdbstub: Fix gdb_register_coprocessor() register counting
parents bc02fb30 321bc0b2

cpus.c

+7 −7
Original line number Diff line number Diff line
@@ -62,12 +62,17 @@ 


static CPUState *next_cpu;



bool cpu_is_stopped(CPUState *cpu)

{

    return cpu->stopped || !runstate_is_running();

}



static bool cpu_thread_is_idle(CPUState *cpu)

{

    if (cpu->stop || cpu->queued_work_first) {

        return false;

    }

    if (cpu->stopped || !runstate_is_running()) {

    if (cpu_is_stopped(cpu)) {

        return true;

    }

    if (!cpu->halted || qemu_cpu_has_work(cpu) ||
@@ -429,11 +434,6 @@ void cpu_synchronize_all_post_init(void) 
    }

}



bool cpu_is_stopped(CPUState *cpu)

{

    return !runstate_is_running() || cpu->stopped;

}



static int do_vm_stop(RunState state)

{

    int ret = 0;
@@ -457,7 +457,7 @@ static bool cpu_can_run(CPUState *cpu) 
    if (cpu->stop) {

        return false;

    }

    if (cpu->stopped || !runstate_is_running()) {

    if (cpu_is_stopped(cpu)) {

        return false;

    }

    return true;

gdbstub.c

+4 −2
Original line number Diff line number Diff line
@@ -621,6 +621,8 @@ void gdb_register_coprocessor(CPUState *cpu, 
        if (g_pos != s->base_reg) {

            fprintf(stderr, "Error: Bad gdb register numbering for '%s'\n"

                    "Expected %d got %d\n", xml, g_pos, s->base_reg);

        } else {

            cpu->gdb_num_g_regs = cpu->gdb_num_regs;

        }

    }

}
@@ -902,7 +904,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
    case 'g':

        cpu_synchronize_state(s->g_cpu);

        len = 0;

        for (addr = 0; addr < s->g_cpu->gdb_num_regs; addr++) {

        for (addr = 0; addr < s->g_cpu->gdb_num_g_regs; addr++) {

            reg_size = gdb_read_register(s->g_cpu, mem_buf + len, addr);

            len += reg_size;

        }
@@ -914,7 +916,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 
        registers = mem_buf;

        len = strlen(p) / 2;

        hextomem((uint8_t *)registers, p, len);

        for (addr = 0; addr < s->g_cpu->gdb_num_regs && len > 0; addr++) {

        for (addr = 0; addr < s->g_cpu->gdb_num_g_regs && len > 0; addr++) {

            reg_size = gdb_write_register(s->g_cpu, registers, addr);

            len -= reg_size;

            registers += reg_size;

hw/core/qdev.c

+10 −1
Original line number Diff line number Diff line
@@ -752,7 +752,6 @@ static void device_initfn(Object *obj) 
        }

        class = object_class_get_parent(class);

    } while (class != object_class_by_name(TYPE_DEVICE));

    qdev_prop_set_globals(dev, &err);

    if (err != NULL) {

        qerror_report_err(err);

        error_free(err);
@@ -764,6 +763,15 @@ static void device_initfn(Object *obj) 
    assert_no_error(err);

}



static void device_post_init(Object *obj)

{

    DeviceState *dev = DEVICE(obj);

    Error *err = NULL;



    qdev_prop_set_globals(dev, &err);

    assert_no_error(err);

}



/* Unlink device from bus and free the structure.  */

static void device_finalize(Object *obj)

{
@@ -853,6 +861,7 @@ static const TypeInfo device_type_info = { 
    .parent = TYPE_OBJECT,

    .instance_size = sizeof(DeviceState),

    .instance_init = device_initfn,

    .instance_post_init = device_post_init,

    .instance_finalize = device_finalize,

    .class_base_init = device_class_base_init,

    .class_init = device_class_init,

include/qom/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ struct kvm_run; 
 * @current_tb: Currently executing TB.

 * @gdb_regs: Additional GDB registers.

 * @gdb_num_regs: Number of total registers accessible to GDB.

 * @gdb_num_g_regs: Number of registers in GDB 'g' packets.

 * @next_cpu: Next CPU sharing TB cache.

 * @kvm_fd: vCPU file descriptor for KVM.

 *
@@ -188,6 +189,7 @@ struct CPUState { 
    struct TranslationBlock *current_tb;

    struct GDBRegisterState *gdb_regs;

    int gdb_num_regs;

    int gdb_num_g_regs;

    CPUState *next_cpu;



    int kvm_fd;

include/qom/object.h

+3 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ struct Object 
 * @instance_init: This function is called to initialize an object.  The parent

 *   class will have already been initialized so the type is only responsible

 *   for initializing its own members.

 * @instance_post_init: This function is called to finish initialization of

 *   an object, after all @instance_init functions were called.

 * @instance_finalize: This function is called during object destruction.  This

 *   is called before the parent @instance_finalize function has been called.

 *   An object should only free the members that are unique to its type in this
@@ -433,6 +435,7 @@ struct TypeInfo 


    size_t instance_size;

    void (*instance_init)(Object *obj);

    void (*instance_post_init)(Object *obj);

    void (*instance_finalize)(Object *obj);



    bool abstract;