[Qemu-devel] [PULL 0/2] tags/xen-20161102-tag

[Qemu-devel] [PULL 0/2] tags/xen-20161102-tag

[Stefano Stabellini]

The following changes since commit 4eb28abd52d48657cff6ff45e8dbbbefe4dbb414:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20161101-2' into staging (2016-11-01 16:53:05 +0000)

are available in the git repository at:


  git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161102-tag

for you to fetch changes up to 021746c131cdfeab9d82ff918795a9f18d20d7ae:

  PCMachineState: introduce acpi_build_enabled field (2016-11-02 12:26:12 -0700)

----------------------------------------------------------------
Xen 2016/11/02

----------------------------------------------------------------
Thomas Huth (1):
      hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()

Wei Liu (1):
      PCMachineState: introduce acpi_build_enabled field

 hw/i386/acpi-build.c | 2 +-
 hw/i386/pc.c         | 2 ++
 hw/xen/xen_pvdev.c   | 2 +-
 include/hw/i386/pc.h | 2 ++
 xen-common.c         | 6 ++++++
 5 files changed, 12 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL 1/2] hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()

[Stefano Stabellini]

From: Thomas Huth <thuth@redhat.com>

Olaf Hering reported a build failure due to an undefined reference
to 'qemu_log_vprintf'. Explicitely including qemu/log.h seems to
fix the issue.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
Tested-by: Olaf Hering <olaf@aepfle.de>
---
 hw/xen/xen_pvdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xen/xen_pvdev.c b/hw/xen/xen_pvdev.c
index 405e154..5212bc6 100644
--- a/hw/xen/xen_pvdev.c
+++ b/hw/xen/xen_pvdev.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-
+#include "qemu/log.h"
 #include "hw/xen/xen_backend.h"
 #include "hw/xen/xen_pvdev.h"
 
-- 
1.9.1

[Qemu-devel] [PULL 2/2] PCMachineState: introduce acpi_build_enabled field

[Stefano Stabellini]

From: Wei Liu <wei.liu2@citrix.com>

Introduce this field to control whether ACPI build is enabled by a
particular machine or accelerator.

It defaults to true if the machine itself supports ACPI build. Xen
accelerator will disable it because Xen is in charge of building ACPI
tables for the guest.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Sander Eikelenboom <linux@eikelenboom.it>
---
 hw/i386/acpi-build.c | 2 +-
 hw/i386/pc.c         | 2 ++
 include/hw/i386/pc.h | 2 ++
 xen-common.c         | 6 ++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 5cd1da9..13cbbde 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2953,7 +2953,7 @@ void acpi_setup(void)
         return;
     }
 
-    if (!pcmc->has_acpi_build) {
+    if (!pcms->acpi_build_enabled) {
         ACPI_BUILD_DPRINTF("ACPI build disabled. Bailing out.\n");
         return;
     }
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index f56ea0f..fbd9aed 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2159,6 +2159,8 @@ static void pc_machine_initfn(Object *obj)
     pcms->vmport = ON_OFF_AUTO_AUTO;
     /* nvdimm is disabled on default. */
     pcms->acpi_nvdimm_state.is_enabled = false;
+    /* acpi build is enabled by default if machine supports it */
+    pcms->acpi_build_enabled = PC_MACHINE_GET_CLASS(pcms)->has_acpi_build;
 }
 
 static void pc_machine_reset(void)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 98dc772..8eb517f 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -62,6 +62,8 @@ struct PCMachineState {
 
     AcpiNVDIMMState acpi_nvdimm_state;
 
+    bool acpi_build_enabled;
+
     /* RAM information (sizes, addresses, configuration): */
     ram_addr_t below_4g_mem_size, above_4g_mem_size;
 
diff --git a/xen-common.c b/xen-common.c
index 9099760..bacf962 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "hw/i386/pc.h"
 #include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
 #include "sysemu/char.h"
@@ -114,6 +115,11 @@ static void xen_change_state_handler(void *opaque, int running,
 
 static int xen_init(MachineState *ms)
 {
+    PCMachineState *pcms = PC_MACHINE(ms);
+
+    /* Disable ACPI build because Xen handles it */
+    pcms->acpi_build_enabled = false;
+
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_pv_printf(NULL, 0, "can't open xen interface\n");
-- 
1.9.1

Re: [Qemu-devel] [PULL 0/2] tags/xen-20161102-tag

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

On Wed, Nov 02, 2016 at 01:54:25PM -0700, Stefano Stabellini wrote:
> The following changes since commit 4eb28abd52d48657cff6ff45e8dbbbefe4dbb414:
> 
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20161101-2' into staging (2016-11-01 16:53:05 +0000)
> 
> are available in the git repository at:
> 
> 
>   git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161102-tag
> 
> for you to fetch changes up to 021746c131cdfeab9d82ff918795a9f18d20d7ae:
> 
>   PCMachineState: introduce acpi_build_enabled field (2016-11-02 12:26:12 -0700)
> 
> ----------------------------------------------------------------
> Xen 2016/11/02
> 
> ----------------------------------------------------------------
> Thomas Huth (1):
>       hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()
> 
> Wei Liu (1):
>       PCMachineState: introduce acpi_build_enabled field
> 
>  hw/i386/acpi-build.c | 2 +-
>  hw/i386/pc.c         | 2 ++
>  hw/xen/xen_pvdev.c   | 2 +-
>  include/hw/i386/pc.h | 2 ++
>  xen-common.c         | 6 ++++++
>  5 files changed, 12 insertions(+), 2 deletions(-)
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]