* [Qemu-devel] [PATCH] pvpanic: fix bad merge
@ 2013-08-13 14:09 Anthony Liguori
2013-08-13 14:17 ` Michael S. Tsirkin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-08-13 14:09 UTC (permalink / raw)
To: qemu-devel; +Cc: Anthony Liguori, Markus Armbruster, Michael Tsirkin
Context matching caused the 'has_pvpanic = true' to be applied to
the 1.6 machine type instead of the 1.5 machine type.
Reported-by: Markus Armbruster <armbru@redhat.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 55c24f2..6e1e654 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -252,12 +252,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
{
has_pci_info = false;
- has_pvpanic = true;
pc_init_pci(args);
}
static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
{
+ has_pvpanic = true;
pc_init_pci_1_6(args);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index bd25071..10e770e 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -221,12 +221,12 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
{
has_pci_info = false;
- has_pvpanic = true;
pc_q35_init(args);
}
static void pc_q35_init_1_5(QEMUMachineInitArgs *args)
{
+ has_pvpanic = true;
pc_q35_init_1_6(args);
}
--
1.8.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge
2013-08-13 14:09 [Qemu-devel] [PATCH] pvpanic: fix bad merge Anthony Liguori
@ 2013-08-13 14:17 ` Michael S. Tsirkin
2013-08-13 14:53 ` Markus Armbruster
2013-08-14 16:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2013-08-13 14:17 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Markus Armbruster
On Tue, Aug 13, 2013 at 09:09:11AM -0500, Anthony Liguori wrote:
> Context matching caused the 'has_pvpanic = true' to be applied to
> the 1.6 machine type instead of the 1.5 machine type.
>
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Reported-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/i386/pc_piix.c | 2 +-
> hw/i386/pc_q35.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 55c24f2..6e1e654 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -252,12 +252,12 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
> static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
> {
> has_pci_info = false;
> - has_pvpanic = true;
> pc_init_pci(args);
> }
>
> static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
> {
> + has_pvpanic = true;
> pc_init_pci_1_6(args);
> }
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index bd25071..10e770e 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -221,12 +221,12 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
> static void pc_q35_init_1_6(QEMUMachineInitArgs *args)
> {
> has_pci_info = false;
> - has_pvpanic = true;
> pc_q35_init(args);
> }
>
> static void pc_q35_init_1_5(QEMUMachineInitArgs *args)
> {
> + has_pvpanic = true;
> pc_q35_init_1_6(args);
> }
>
> --
> 1.8.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge
2013-08-13 14:09 [Qemu-devel] [PATCH] pvpanic: fix bad merge Anthony Liguori
2013-08-13 14:17 ` Michael S. Tsirkin
@ 2013-08-13 14:53 ` Markus Armbruster
2013-08-14 16:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2013-08-13 14:53 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Michael Tsirkin
Anthony Liguori <aliguori@us.ibm.com> writes:
> Context matching caused the 'has_pvpanic = true' to be applied to
> the 1.6 machine type instead of the 1.5 machine type.
>
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Reported-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pvpanic: fix bad merge
2013-08-13 14:09 [Qemu-devel] [PATCH] pvpanic: fix bad merge Anthony Liguori
2013-08-13 14:17 ` Michael S. Tsirkin
2013-08-13 14:53 ` Markus Armbruster
@ 2013-08-14 16:26 ` Anthony Liguori
2 siblings, 0 replies; 4+ messages in thread
From: Anthony Liguori @ 2013-08-14 16:26 UTC (permalink / raw)
To: Anthony Liguori, qemu-devel; +Cc: Markus Armbruster, Michael Tsirkin
Applied. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-14 16:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-13 14:09 [Qemu-devel] [PATCH] pvpanic: fix bad merge Anthony Liguori
2013-08-13 14:17 ` Michael S. Tsirkin
2013-08-13 14:53 ` Markus Armbruster
2013-08-14 16:26 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).