[Qemu-commits] [qemu/qemu] 49fa98: xen: simplify xen_enabled

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 49fa9881b2358e390e9e9466ddde74e995927efa
      
https://github.com/qemu/qemu/commit/49fa9881b2358e390e9e9466ddde74e995927efa
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M include/hw/xen/xen.h

  Log Message:
  -----------
  xen: simplify xen_enabled

No need for preprocessor conditionals in xen_enabled: xen_allowed is
always defined.

Signed-off-by: Stefano Stabellini <address@hidden>
CC: address@hidden


  Commit: a7d4207d378069a5bb3175a131e8fdedd39ef97d
      
https://github.com/qemu/qemu/commit/a7d4207d378069a5bb3175a131e8fdedd39ef97d
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  main_loop: do not set nonblocking if xen_enabled()

Signed-off-by: Stefano Stabellini <address@hidden>
CC: address@hidden


  Commit: 58ee9b0ae05d81c74d6869a25ce4263fc22ed809
      
https://github.com/qemu/qemu/commit/58ee9b0ae05d81c74d6869a25ce4263fc22ed809
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M hw/i386/xen_machine_pv.c

  Log Message:
  -----------
  xen_machine_pv: do not create a dummy CPU in machine->init

This fixes a regression introduced by:

commit 62fc403f11523169eb4264de31279745f48e3ecc
Author: Igor Mammedov <address@hidden>
Date:   Mon Apr 29 18:54:13 2013 +0200

    target-i386: Attach ICC bus to CPU on its creation

    X86CPU should have parent bus so it could provide bus for child APIC.

The commit makes it mandatory to pass a valid ICC bus to cpu_x86_create,
but cpu_x86_init just passes NULL to it.
xen_machine_pv uses cpu_x86_init, therefore it has been broken.

This patch fixes the problem by removing the dummy CPU creation
altogether from xen_init_pv, relying on the fact that QEMU can now cope
with a machine without an emulated CPU.

Signed-off-by: Stefano Stabellini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
CC: address@hidden
CC: address@hidden


  Commit: 9f24a8030a70ea4954b5b8c48f606012f086f65f
      
https://github.com/qemu/qemu/commit/9f24a8030a70ea4954b5b8c48f606012f086f65f
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M include/hw/i386/pc.h
    M xen-all.c

  Log Message:
  -----------
  xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)

We are currently setting the PCI hole to start at HVM_BELOW_4G_RAM_END,
that is 0xf0000000.
Start the PCI hole at 0xe0000000 instead, that is the same value used by
pc_init1 and qemu-xen-traditional.

Signed-off-by: Stefano Stabellini <address@hidden>
CC: address@hidden


  Commit: 95222d0945ac8e7fea2adf2fc927634ff3ea1389
      
https://github.com/qemu/qemu/commit/95222d0945ac8e7fea2adf2fc927634ff3ea1389
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M include/hw/xen/xen.h
    M xen-all.c

  Log Message:
  -----------
  xen: remove xen_vcpu_init

No need for xen_vcpu_init anymore:

- the RTC emulator doesn't have any periodic timers continuously running
even in absence of guest interactions anymore;

- qemu_dummy_start_vcpu takes care of disabling TCG for us, so we don't
need to do it manually here.

Signed-off-by: Stefano Stabellini <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>


  Commit: 9cdf79d068f52f7de347cb45cfd8903519410e4d
      
https://github.com/qemu/qemu/commit/9cdf79d068f52f7de347cb45cfd8903519410e4d
  Author: Stefano Stabellini <address@hidden>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

Call kvmclock_create only if kvmclock_enabled.
Use pc_init_pci on Xen rather than pc_init_pci_no_kvmclock.

Signed-off-by: Stefano Stabellini <address@hidden>


  Commit: 8819c10b5d55d537d59a0ffd5d623f348fc36c47
      
https://github.com/qemu/qemu/commit/8819c10b5d55d537d59a0ffd5d623f348fc36c47
  Author: Anthony Liguori <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/xen_machine_pv.c
    M include/hw/i386/pc.h
    M include/hw/xen/xen.h
    M vl.c
    M xen-all.c

  Log Message:
  -----------
  Merge remote-tracking branch 'sstabellini/xen_fixes_20130603' into staging

* sstabellini/xen_fixes_20130603:
  xen: use pc_init_pci instead of pc_init_pci_no_kvmclock
  xen: remove xen_vcpu_init
  xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)
  xen_machine_pv: do not create a dummy CPU in machine->init
  main_loop: do not set nonblocking if xen_enabled()
  xen: simplify xen_enabled

Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a3416197447e...8819c10b5d55