Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[qemu.git] / hw / acpi / pcihp.c

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index f80c48008cb3aab6a0d5d1b0dcc4960c363d5f49..34dedf1e8bfbcd212b4270fb76a247eadee71540 100644 (file)
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -63,16 +63,18 @@ typedef struct AcpiPciHpFind {
 
 static int acpi_pcihp_get_bsel(PCIBus *bus)
 {
 
 static int acpi_pcihp_get_bsel(PCIBus *bus)
 {

-    QObject *o = object_property_get_qobject(OBJECT(bus),
-                                             ACPI_PCIHP_PROP_BSEL, NULL);
-    int64_t bsel = -1;
-    if (o) {
-        bsel = qint_get_int(qobject_to_qint(o));
-    }
-    if (bsel < 0) {
+    Error *local_err = NULL;
+    int64_t bsel = object_property_get_int(OBJECT(bus), ACPI_PCIHP_PROP_BSEL,
+                                           &local_err);
+
+    if (local_err || bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) {
+        if (local_err) {
+            error_free(local_err);
+        }

         return -1;
         return -1;

+    } else {
+        return bsel;

     }
     }

-    return bsel;

 }
 
 static void acpi_pcihp_test_hotplug_bus(PCIBus *bus, void *opaque)
 }
 
 static void acpi_pcihp_test_hotplug_bus(PCIBus *bus, void *opaque)


@@ -229,7 +231,7 @@ static uint64_t pci_read(void *opaque, hwaddr addr, unsigned int size)
     uint32_t val = 0;
     int bsel = s->hotplug_select;
 
     uint32_t val = 0;
     int bsel = s->hotplug_select;
 

-    if (bsel < 0 || bsel > ACPI_PCIHP_MAX_HOTPLUG_BUS) {
+    if (bsel < 0 || bsel >= ACPI_PCIHP_MAX_HOTPLUG_BUS) {

         return 0;
     }
 
         return 0;
     }
 


@@ -322,8 +324,7 @@ const VMStateDescription vmstate_acpi_pcihp_pci_status = {
     .name = "acpi_pcihp_pci_status",
     .version_id = 1,
     .minimum_version_id = 1,
     .name = "acpi_pcihp_pci_status",
     .version_id = 1,
     .minimum_version_id = 1,

-    .minimum_version_id_old = 1,
-    .fields      = (VMStateField []) {
+    .fields = (VMStateField[]) {

         VMSTATE_UINT32(up, AcpiPciHpPciStatus),
         VMSTATE_UINT32(down, AcpiPciHpPciStatus),
         VMSTATE_END_OF_LIST()
         VMSTATE_UINT32(up, AcpiPciHpPciStatus),
         VMSTATE_UINT32(down, AcpiPciHpPciStatus),
         VMSTATE_END_OF_LIST()