* [PULL 0/1] tags/xen-20161108-tag
@ 2016-11-08 19:59 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2016-11-08 19:59 UTC (permalink / raw)
To: peter.maydell
Cc: anthony.perard, stefanha, sstabellini, qemu-devel, xen-devel
The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
are available in the git repository at:
git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
----------------------------------------------------------------
Xen 2016/11/08
----------------------------------------------------------------
Anthony PERARD (1):
xen: Fix xenpv machine initialisation
xen-common.c | 6 ------
xen-hvm.c | 4 ++++
2 files changed, 4 insertions(+), 6 deletions(-)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* [Qemu-devel] [PULL] xen: Fix xenpv machine initialisation
2016-11-08 19:59 ` Stefano Stabellini
@ 2016-11-08 20:00 ` Stefano Stabellini
-1 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2016-11-08 20:00 UTC (permalink / raw)
To: peter.maydell
Cc: sstabellini, stefanha, anthony.perard, qemu-devel, xen-devel
From: Anthony PERARD <anthony.perard@citrix.com>
When using QEMU for Xen PV guest, QEMU abort with:
xen-common.c:118:xen_init: Object 0x7f2b8325dcb0 is not an instance of type generic-pc-machine
This is because the machine 'xenpv' also use accel=xen. Moving the code
to xen_hvm_init() fix the issue.
This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
xen-common.c | 6 ------
xen-hvm.c | 4 ++++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/xen-common.c b/xen-common.c
index bacf962..9099760 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/i386/pc.h"
#include "hw/xen/xen_backend.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
@@ -115,11 +114,6 @@ 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");
diff --git a/xen-hvm.c b/xen-hvm.c
index 2f348ed..150c7e7 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
}
xen_be_register_common();
xen_read_physmap(state);
+
+ /* Disable ACPI build because Xen handles it */
+ pcms->acpi_build_enabled = false;
+
return;
err:
--
1.9.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL] xen: Fix xenpv machine initialisation
@ 2016-11-08 20:00 ` Stefano Stabellini
0 siblings, 0 replies; 10+ messages in thread
From: Stefano Stabellini @ 2016-11-08 20:00 UTC (permalink / raw)
To: peter.maydell
Cc: anthony.perard, stefanha, sstabellini, qemu-devel, xen-devel
From: Anthony PERARD <anthony.perard@citrix.com>
When using QEMU for Xen PV guest, QEMU abort with:
xen-common.c:118:xen_init: Object 0x7f2b8325dcb0 is not an instance of type generic-pc-machine
This is because the machine 'xenpv' also use accel=xen. Moving the code
to xen_hvm_init() fix the issue.
This fix 021746c131cdfeab9d82ff918795a9f18d20d7ae.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---
xen-common.c | 6 ------
xen-hvm.c | 4 ++++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/xen-common.c b/xen-common.c
index bacf962..9099760 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -9,7 +9,6 @@
*/
#include "qemu/osdep.h"
-#include "hw/i386/pc.h"
#include "hw/xen/xen_backend.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
@@ -115,11 +114,6 @@ 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");
diff --git a/xen-hvm.c b/xen-hvm.c
index 2f348ed..150c7e7 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -1316,6 +1316,10 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
}
xen_be_register_common();
xen_read_physmap(state);
+
+ /* Disable ACPI build because Xen handles it */
+ pcms->acpi_build_enabled = false;
+
return;
err:
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PULL 0/1] tags/xen-20161108-tag
2016-11-08 19:59 ` Stefano Stabellini
(?)
(?)
@ 2016-11-17 9:56 ` Sander Eikelenboom
2016-11-17 14:05 ` Wei Liu
-1 siblings, 1 reply; 10+ messages in thread
From: Sander Eikelenboom @ 2016-11-17 9:56 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: anthony.perard, xen-devel, Wei Liu
Tuesday, November 8, 2016, 8:59:46 PM, you wrote:
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
> Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
> are available in the git repository at:
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
> for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
> xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
> ----------------------------------------------------------------
> Xen 2016/11/08
> ----------------------------------------------------------------
> Anthony PERARD (1):
> xen: Fix xenpv machine initialisation
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 insertions(+), 6 deletions(-)
Hi Stefano / Wei,
It seems your pull request hasn't been pulled in qemu-upstream yet.
However i think Wei could be waiting for it in order to be able to backport
both the original patch and this fix to it, to the qemu-xen tree.
So perhaps it is time for a polite ping ?
--
Sander
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PULL 0/1] tags/xen-20161108-tag
2016-11-17 9:56 ` [PULL 0/1] tags/xen-20161108-tag Sander Eikelenboom
@ 2016-11-17 14:05 ` Wei Liu
0 siblings, 0 replies; 10+ messages in thread
From: Wei Liu @ 2016-11-17 14:05 UTC (permalink / raw)
To: Sander Eikelenboom; +Cc: anthony.perard, xen-devel, Stefano Stabellini, Wei Liu
On Thu, Nov 17, 2016 at 10:56:50AM +0100, Sander Eikelenboom wrote:
>
> Tuesday, November 8, 2016, 8:59:46 PM, you wrote:
>
> > The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
>
> > Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
>
> > are available in the git repository at:
>
>
> > git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
>
> > for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
>
> > xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
>
> > ----------------------------------------------------------------
> > Xen 2016/11/08
>
> > ----------------------------------------------------------------
> > Anthony PERARD (1):
> > xen: Fix xenpv machine initialisation
>
> > xen-common.c | 6 ------
> > xen-hvm.c | 4 ++++
> > 2 files changed, 4 insertions(+), 6 deletions(-)
>
>
> Hi Stefano / Wei,
>
> It seems your pull request hasn't been pulled in qemu-upstream yet.
> However i think Wei could be waiting for it in order to be able to backport
> both the original patch and this fix to it, to the qemu-xen tree.
>
> So perhaps it is time for a polite ping ?
>
Done.
> --
> Sander
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PULL 0/1] tags/xen-20161108-tag
2016-11-08 19:59 ` Stefano Stabellini
` (2 preceding siblings ...)
(?)
@ 2016-11-17 14:05 ` Wei Liu
-1 siblings, 0 replies; 10+ messages in thread
From: Wei Liu @ 2016-11-17 14:05 UTC (permalink / raw)
To: peter.maydell, stefanha
Cc: anthony.perard, qemu-devel, xen-devel, Wei Liu,
Stefano Stabellini
Hi Peter and Stefan, can you merge this pull request? We want to
backport this patch once it is merged.
Thanks
Wei.
On Tue, Nov 08, 2016 at 11:59:46AM -0800, Stefano Stabellini wrote:
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
>
> Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
>
> are available in the git repository at:
>
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
>
> for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
>
> xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
>
> ----------------------------------------------------------------
> Xen 2016/11/08
>
> ----------------------------------------------------------------
> Anthony PERARD (1):
> xen: Fix xenpv machine initialisation
>
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PULL 0/1] tags/xen-20161108-tag
2016-11-08 19:59 ` Stefano Stabellini
` (3 preceding siblings ...)
(?)
@ 2016-11-17 14:05 ` Wei Liu
-1 siblings, 0 replies; 10+ messages in thread
From: Wei Liu @ 2016-11-17 14:05 UTC (permalink / raw)
To: peter.maydell, stefanha
Cc: anthony.perard, xen-devel, Stefano Stabellini, Wei Liu,
qemu-devel
Hi Peter and Stefan, can you merge this pull request? We want to
backport this patch once it is merged.
Thanks
Wei.
On Tue, Nov 08, 2016 at 11:59:46AM -0800, Stefano Stabellini wrote:
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
>
> Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
>
> are available in the git repository at:
>
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
>
> for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
>
> xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
>
> ----------------------------------------------------------------
> Xen 2016/11/08
>
> ----------------------------------------------------------------
> Anthony PERARD (1):
> xen: Fix xenpv machine initialisation
>
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 insertions(+), 6 deletions(-)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Qemu-devel] [PULL 0/1] tags/xen-20161108-tag
2016-11-08 19:59 ` Stefano Stabellini
@ 2016-11-21 15:32 ` Stefan Hajnoczi
-1 siblings, 0 replies; 10+ messages in thread
From: Stefan Hajnoczi @ 2016-11-21 15:32 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: peter.maydell, anthony.perard, xen-devel, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 998 bytes --]
On Tue, Nov 08, 2016 at 11:59:46AM -0800, Stefano Stabellini wrote:
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
>
> Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
>
> are available in the git repository at:
>
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
>
> for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
>
> xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
>
> ----------------------------------------------------------------
> Xen 2016/11/08
>
> ----------------------------------------------------------------
> Anthony PERARD (1):
> xen: Fix xenpv machine initialisation
>
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 insertions(+), 6 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 --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PULL 0/1] tags/xen-20161108-tag
@ 2016-11-21 15:32 ` Stefan Hajnoczi
0 siblings, 0 replies; 10+ messages in thread
From: Stefan Hajnoczi @ 2016-11-21 15:32 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: anthony.perard, peter.maydell, qemu-devel, xen-devel
[-- Attachment #1.1: Type: text/plain, Size: 998 bytes --]
On Tue, Nov 08, 2016 at 11:59:46AM -0800, Stefano Stabellini wrote:
> The following changes since commit 207faf24c58859f5240f66bf6decc33b87a1776e:
>
> Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161107' into staging (2016-11-07 14:02:15 +0000)
>
> are available in the git repository at:
>
>
> git://xenbits.xen.org/people/sstabellini/qemu-dm.git tags/xen-20161108-tag
>
> for you to fetch changes up to 804ba7c10bbc66bb8a8aa73ecc60f620da7423d5:
>
> xen: Fix xenpv machine initialisation (2016-11-08 11:17:30 -0800)
>
> ----------------------------------------------------------------
> Xen 2016/11/08
>
> ----------------------------------------------------------------
> Anthony PERARD (1):
> xen: Fix xenpv machine initialisation
>
> xen-common.c | 6 ------
> xen-hvm.c | 4 ++++
> 2 files changed, 4 insertions(+), 6 deletions(-)
Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging
Stefan
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
[-- Attachment #2: Type: text/plain, Size: 127 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 10+ messages in thread