[PULL,2.3,00/38] ppc patch queue 2015-03-08
diff mbox

Message ID 54FDA7E3.2070103@suse.de
State New
Headers show

Commit Message

Alexander Graf March 9, 2015, 2:02 p.m. UTC
On 09.03.15 08:16, Peter Maydell wrote:
> On 9 March 2015 at 21:30, Alexander Graf <agraf@suse.de> wrote:
>>
>>
>> On 09.03.15 04:13, Peter Maydell wrote:
>>> On 8 March 2015 at 17:44, Alexander Graf <agraf@suse.de> wrote:
>>>> Hi Peter,
>>>>
>>>> This is my current patch queue for ppc.  Please pull.
>>>>
>>>> Alex
>>>>
>>>>
>>>> The following changes since commit 3539bbb93e944ffde31c61c369ea9eedcc5697a6:
>>>>
>>>>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150302.0' into staging (2015-03-04 14:37:31 +0000)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>
>>>>   git://github.com/agraf/qemu.git tags/signed-ppc-for-upstream
>>>>
>>>> for you to fetch changes up to fa11371474207feeda6ca316e03a9bffd1710276:
>>>>
>>>>   sPAPR: Implement sPAPRPHBClass EEH callbacks (2015-03-08 09:40:20 +0100)
>>>>
>>>> ----------------------------------------------------------------
>>>> Patch queue for ppc - 2015-03-08
>>>>
>>>> This is my current patch queue for 2.3. Highlights include:
>>>>
>>>>   * pseries: 2.3 machine
>>>>   * pseries: Export RTC via QOM
>>>>   * pseries: EEH support
>>>>   * mac: save/restore support
>>>>   * fix POWER5 hosts
>>>>   * random bug fixes
>>>>
>>>> ----------------------------------------------------------------
> 
> This is giving merge conflicts in hw/display/vga-pci.c now;
> they seem more complicated than merely textual, since they're
> adding a new object property and the function they're changing
> has changed semantics from an initfn to a realizefn. You
> probably need to add a new instance init fn to the devices.

Hooray :). I've fixed up the patch, rebased and updated the tag. Updated
patch is below.


Alex


From 3c2784fc864d943ff70a2a5c9dea8e9a9b4d9e1d Mon Sep 17 00:00:00 2001
From: David Gibson <david@gibson.dropbear.id.au>
Date: Tue, 10 Feb 2015 15:36:15 +1100
Subject: [PULL 17/38] vga: Expose framebuffer byteorder as a QOM property

The VGA device model now supports having the framebuffer in either endian,
and can be switched between these by the guest via a register in the qext
region.

However, in some cases (e.g. LE OS on the pseries machine) we have
existing guest that don't know about the endian switch register, but other
parts of the qemu code have better information to set a default endianness
than the VGA code does of itself.

In order to allow them to set a correct default endianness in these cases,
without breaking abstraction walls, this patch exposes the VGA framebuffer
endianness via a writable QOM property.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
[agraf: use instance_init for property exposure]
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/display/vga-pci.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

 {
     PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, dev);
@@ -265,7 +286,13 @@ static void pci_secondary_vga_realize(PCIDevice
*dev, Error **errp)

     pci_register_bar(&d->dev, 0, PCI_BASE_ADDRESS_MEM_PREFETCH, &s->vram);
     pci_register_bar(&d->dev, 2, PCI_BASE_ADDRESS_SPACE_MEMORY, &d->mmio);
+}

+static void pci_secondary_vga_init(Object *obj)
+{
+    /* Expose framebuffer byteorder via QOM */
+    object_property_add_bool(obj, "big-endian-framebuffer",
+                             vga_get_big_endian_fb,
vga_set_big_endian_fb, NULL);
 }

 static void pci_secondary_vga_reset(DeviceState *dev)
@@ -324,6 +351,7 @@ static void secondary_class_init(ObjectClass *klass,
void *data)
 static const TypeInfo vga_info = {
     .name          = "VGA",
     .parent        = TYPE_PCI_DEVICE,
+    .instance_init = pci_std_vga_init,
     .instance_size = sizeof(PCIVGAState),
     .class_init    = vga_class_init,
 };
@@ -331,6 +359,7 @@ static const TypeInfo vga_info = {
 static const TypeInfo secondary_info = {
     .name          = "secondary-vga",
     .parent        = TYPE_PCI_DEVICE,
+    .instance_init = pci_secondary_vga_init,
     .instance_size = sizeof(PCIVGAState),
     .class_init    = secondary_class_init,
 };
--
1.8.1.4

Comments

Peter Maydell March 9, 2015, 3:14 p.m. UTC | #1
On 9 March 2015 at 23:02, Alexander Graf <agraf@suse.de> wrote:
> Hooray :). I've fixed up the patch, rebased and updated the tag. Updated
> patch is below.

Applied fixed version, thanks.

-- PMM

Patch
diff mbox

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index d67f748..aabfc23 100644
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -181,6 +181,20 @@  static void pci_vga_qext_write(void *ptr, hwaddr addr,
     }
 }

+static bool vga_get_big_endian_fb(Object *obj, Error **errp)
+{
+    PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, PCI_DEVICE(obj));
+
+    return d->vga.big_endian_fb;
+}
+
+static void vga_set_big_endian_fb(Object *obj, bool value, Error **errp)
+{
+    PCIVGAState *d = DO_UPCAST(PCIVGAState, dev, PCI_DEVICE(obj));
+
+    d->vga.big_endian_fb = value;
+}
+
 static const MemoryRegionOps pci_vga_qext_ops = {
     .read = pci_vga_qext_read,
     .write = pci_vga_qext_write,
@@ -234,6 +248,13 @@  static void pci_std_vga_realize(PCIDevice *dev,
Error **errp)
     }
 }

+static void pci_std_vga_init(Object *obj)
+{
+    /* Expose framebuffer byteorder via QOM */
+    object_property_add_bool(obj, "big-endian-framebuffer",
+                             vga_get_big_endian_fb,
vga_set_big_endian_fb, NULL);
+}
+
 static void pci_secondary_vga_realize(PCIDevice *dev, Error **errp)