[Qemu-devel] [PULL 0/2] Xen 2015-10-19-tag

[Qemu-devel] [PULL 0/2] Xen 2015-10-19-tag

[Stefano Stabellini]

The following changes since commit aedc8806172dd1ae904f04169ee3b19fce1d7893:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20151019-1' into staging (2015-10-19 10:06:56 +0100)

are available in the git repository at:


  git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/2015-10-19-tag

for you to fetch changes up to dbb7405d8caad0814ceddd568cb49f163a847561:

  xen-platform: Ensure xen is enabled when initializing (2015-10-19 10:16:01 +0000)

----------------------------------------------------------------
Xen 2015-10-19

----------------------------------------------------------------
Eduardo Habkost (2):
      pc: Require xen when initializing xenfv machine
      xen-platform: Ensure xen is enabled when initializing

 hw/i386/pc_piix.c          |    5 +++++
 hw/i386/xen/xen_platform.c |    3 +++
 2 files changed, 8 insertions(+)

[Qemu-devel] [PULL 1/2] pc: Require xen when initializing xenfv machine

[Stefano Stabellini]

From: Eduardo Habkost <ehabkost@redhat.com>

Without this check, the xen-platform device will crash on reset
if using the accel option with anything other than xen (e.g.
"-machine xenfv,accel=kvm").

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 hw/i386/pc_piix.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ae7bbeb..a91cc3d 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -434,6 +434,11 @@ static void pc_xen_hvm_init(MachineState *machine)
 {
     PCIBus *bus;
 
+    if (!xen_enabled()) {
+        error_report("xenfv machine requires the xen accelerator");
+        exit(1);
+    }
+
     pc_xen_hvm_init_pci(machine);
 
     bus = pci_find_primary_bus();
-- 
1.7.10.4

[Qemu-devel] [PULL 2/2] xen-platform: Ensure xen is enabled when initializing

[Stefano Stabellini]

From: Eduardo Habkost <ehabkost@redhat.com>

The xen-platform code crashes on reset if the xen backend is not
initialized, because it calls xc_hvm_set_mem_type(). Ensure xen-platform
won't be created without initializing the xen backend.

The assert can't be triggered by the user because the device is not
hotpluggable, and the only code creating it (at pc_xen_hvm_init())
already checks xen_enabled().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 hw/i386/xen/xen_platform.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index ee45f03..8682c42 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -387,6 +387,9 @@ static int xen_platform_initfn(PCIDevice *dev)
     PCIXenPlatformState *d = XEN_PLATFORM(dev);
     uint8_t *pci_conf;
 
+    /* Device will crash on reset if xen is not initialized */
+    assert(xen_enabled());
+
     pci_conf = dev->config;
 
     pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
-- 
1.7.10.4

Re: [Qemu-devel] [PULL 2/2] xen-platform: Ensure xen is enabled when initializing

[Paolo Bonzini]

On 19/10/2015 12:23, Stefano Stabellini wrote:
> The xen-platform code crashes on reset if the xen backend is not
> initialized, because it calls xc_hvm_set_mem_type(). Ensure xen-platform
> won't be created without initializing the xen backend.
> 
> The assert can't be triggered by the user because the device is not
> hotpluggable, and the only code creating it (at pc_xen_hvm_init())
> already checks xen_enabled().

The device is not hotpluggable, but it is accessible with -device.  This
is by design because IIUC, we want -M xenfv to be phased out in favor of
the PC machines plus -device xen-platform.

Thus, k->init should be changed to k->realize instead.  I guess it can
be done on top of this pull request, so I'm not blocking it.

Paolo

> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> ---
>  hw/i386/xen/xen_platform.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
> index ee45f03..8682c42 100644
> --- a/hw/i386/xen/xen_platform.c
> +++ b/hw/i386/xen/xen_platform.c
> @@ -387,6 +387,9 @@ static int xen_platform_initfn(PCIDevice *dev)
>      PCIXenPlatformState *d = XEN_PLATFORM(dev);
>      uint8_t *pci_conf;
>  
> +    /* Device will crash on reset if xen is not initialized */
> +    assert(xen_enabled());
> +

Re: [Qemu-devel] [PULL 2/2] xen-platform: Ensure xen is enabled when initializing

[Eduardo Habkost]

On Mon, Oct 19, 2015 at 12:48:11PM +0200, Paolo Bonzini wrote:
> 
> 
> On 19/10/2015 12:23, Stefano Stabellini wrote:
> > The xen-platform code crashes on reset if the xen backend is not
> > initialized, because it calls xc_hvm_set_mem_type(). Ensure xen-platform
> > won't be created without initializing the xen backend.
> > 
> > The assert can't be triggered by the user because the device is not
> > hotpluggable, and the only code creating it (at pc_xen_hvm_init())
> > already checks xen_enabled().
> 
> The device is not hotpluggable, but it is accessible with -device.  This
> is by design because IIUC, we want -M xenfv to be phased out in favor of
> the PC machines plus -device xen-platform.

Oops, that means the assert() needs to be replaced with proper error
reporting. I will do it.

> 
> Thus, k->init should be changed to k->realize instead.  I guess it can
> be done on top of this pull request, so I'm not blocking it.

xen_platform_initfn() is PCIDeviceClass::init, which is called from
realize.

-- 
Eduardo

Re: [Qemu-devel] [PULL 0/2] Xen 2015-10-19-tag

[Peter Maydell]

On 19 October 2015 at 11:23, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following changes since commit aedc8806172dd1ae904f04169ee3b19fce1d7893:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20151019-1' into staging (2015-10-19 10:06:56 +0100)
>
> are available in the git repository at:
>
>
>   git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/2015-10-19-tag
>
> for you to fetch changes up to dbb7405d8caad0814ceddd568cb49f163a847561:
>
>   xen-platform: Ensure xen is enabled when initializing (2015-10-19 10:16:01 +0000)
>
> ----------------------------------------------------------------
> Xen 2015-10-19
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM