[Qemu-devel] [PATCH 0/2] Xen cleanups

[Qemu-devel] [PATCH 0/2] Xen cleanups

[Stefano Stabellini]

Hi all,
just a couple of simple cleanups suggested by Paolo Bonzini:

Stefano Stabellini (2):
      xen: remove xen_vcpu_init
      xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

 hw/i386/pc_piix.c |    5 ++---
 xen-all.c         |   23 -----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

- Stefano

[PATCH 0/2] Xen cleanups

[Stefano Stabellini]

Hi all,
just a couple of simple cleanups suggested by Paolo Bonzini:

Stefano Stabellini (2):
      xen: remove xen_vcpu_init
      xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

 hw/i386/pc_piix.c |    5 ++---
 xen-all.c         |   23 -----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

- Stefano

[Qemu-devel] [PATCH 1/2] xen: remove xen_vcpu_init

[Stefano Stabellini]

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 <stefano.stabellini@eu.citrix.com>
---
 hw/i386/pc_piix.c |    1 -
 xen-all.c         |   23 -----------------------
 2 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 43ab480..1ef4cbf 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -324,7 +324,6 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
         hw_error("xen hardware virtual machine initialisation failed");
     }
     pc_init_pci_no_kvmclock(args);
-    xen_vcpu_init();
 }
 #endif
 
diff --git a/xen-all.c b/xen-all.c
index 539a154..bc308f4 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -574,29 +574,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
     }
 }
 
-/* VCPU Operations, MMIO, IO ring ... */
-
-static void xen_reset_vcpu(void *opaque)
-{
-    CPUState *cpu = opaque;
-
-    cpu->halted = 1;
-}
-
-void xen_vcpu_init(void)
-{
-    if (first_cpu != NULL) {
-        CPUState *cpu = ENV_GET_CPU(first_cpu);
-
-        qemu_register_reset(xen_reset_vcpu, cpu);
-        xen_reset_vcpu(cpu);
-    }
-    /* if rtc_clock is left to default (host_clock), disable it */
-    if (rtc_clock == host_clock) {
-        qemu_clock_enable(rtc_clock, false);
-    }
-}
-
 /* get the ioreq packets from share mem */
 static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
 {
-- 
1.7.2.5

[PATCH 1/2] xen: remove xen_vcpu_init

[Stefano Stabellini]

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 <stefano.stabellini@eu.citrix.com>
---
 hw/i386/pc_piix.c |    1 -
 xen-all.c         |   23 -----------------------
 2 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 43ab480..1ef4cbf 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -324,7 +324,6 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
         hw_error("xen hardware virtual machine initialisation failed");
     }
     pc_init_pci_no_kvmclock(args);
-    xen_vcpu_init();
 }
 #endif
 
diff --git a/xen-all.c b/xen-all.c
index 539a154..bc308f4 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -574,29 +574,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
     }
 }
 
-/* VCPU Operations, MMIO, IO ring ... */
-
-static void xen_reset_vcpu(void *opaque)
-{
-    CPUState *cpu = opaque;
-
-    cpu->halted = 1;
-}
-
-void xen_vcpu_init(void)
-{
-    if (first_cpu != NULL) {
-        CPUState *cpu = ENV_GET_CPU(first_cpu);
-
-        qemu_register_reset(xen_reset_vcpu, cpu);
-        xen_reset_vcpu(cpu);
-    }
-    /* if rtc_clock is left to default (host_clock), disable it */
-    if (rtc_clock == host_clock) {
-        qemu_clock_enable(rtc_clock, false);
-    }
-}
-
 /* get the ioreq packets from share mem */
 static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
 {
-- 
1.7.2.5

Re: [Qemu-devel] [PATCH 1/2] xen: remove xen_vcpu_init

[Andreas Färber]

Am 27.05.2013 20:17, schrieb Stefano Stabellini:
> 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 <stefano.stabellini@eu.citrix.com>
> ---
>  hw/i386/pc_piix.c |    1 -
>  xen-all.c         |   23 -----------------------
>  2 files changed, 0 insertions(+), 24 deletions(-)

Reviewed-by: Andreas Färber <afaerber@suse.de>

and I've queued a copy on qom-cpu since this facilitates my upcoming
first_cpu refactoring.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [PATCH 1/2] xen: remove xen_vcpu_init

[Andreas Färber]

Am 27.05.2013 20:17, schrieb Stefano Stabellini:
> 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 <stefano.stabellini@eu.citrix.com>
> ---
>  hw/i386/pc_piix.c |    1 -
>  xen-all.c         |   23 -----------------------
>  2 files changed, 0 insertions(+), 24 deletions(-)

Reviewed-by: Andreas Färber <afaerber@suse.de>

and I've queued a copy on qom-cpu since this facilitates my upcoming
first_cpu refactoring.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH 2/2] xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

[Stefano Stabellini]

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 <stefano.stabellini@eu.citrix.com>
---
 hw/i386/pc_piix.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1ef4cbf..4308031 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -98,7 +98,7 @@ static void pc_init1(MemoryRegion *system_memory,
     pc_cpus_init(cpu_model, icc_bridge);
     pc_acpi_init("acpi-dsdt.aml");
 
-    if (kvmclock_enabled) {
+    if (kvm_enabled() && kvmclock_enabled) {
         kvmclock_create();
     }
 
@@ -323,7 +323,7 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
     if (xen_hvm_init() != 0) {
         hw_error("xen hardware virtual machine initialisation failed");
     }
-    pc_init_pci_no_kvmclock(args);
+    pc_init_pci(args);
 }
 #endif
 
-- 
1.7.2.5

[PATCH 2/2] xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

[Stefano Stabellini]

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 <stefano.stabellini@eu.citrix.com>
---
 hw/i386/pc_piix.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1ef4cbf..4308031 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -98,7 +98,7 @@ static void pc_init1(MemoryRegion *system_memory,
     pc_cpus_init(cpu_model, icc_bridge);
     pc_acpi_init("acpi-dsdt.aml");
 
-    if (kvmclock_enabled) {
+    if (kvm_enabled() && kvmclock_enabled) {
         kvmclock_create();
     }
 
@@ -323,7 +323,7 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
     if (xen_hvm_init() != 0) {
         hw_error("xen hardware virtual machine initialisation failed");
     }
-    pc_init_pci_no_kvmclock(args);
+    pc_init_pci(args);
 }
 #endif
 
-- 
1.7.2.5