direct-io.hg

changeset 13420:53a1dbb70386

[HVM] Save/Restore: Various structures have changed
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
author Tim Deegan <Tim.Deegan@xensource.com>
date Thu Jan 18 16:48:10 2007 +0000 (2007-01-18)
parents 025218cdb17d
children 5859be201110
files xen/arch/x86/hvm/vioapic.c
line diff
     1.1 --- a/xen/arch/x86/hvm/vioapic.c	Thu Jan 18 16:48:09 2007 +0000
     1.2 +++ b/xen/arch/x86/hvm/vioapic.c	Thu Jan 18 16:48:10 2007 +0000
     1.3 @@ -499,7 +499,9 @@ static void hvmirq_info(struct hvm_irq *
     1.4      for (i = 0; i < BITS_TO_LONGS(1); i++)
     1.5          printk("hvmirq callback_irq_wire[%d]:0x%lx.\n", i, hvm_irq->callback_irq_wire[i]);
     1.6  
     1.7 -    printk("hvmirq callback_gsi:0x%x.\n", hvm_irq->callback_gsi);
     1.8 +    printk("hvmirq callback_via_type:0x%x.\n", hvm_irq->callback_via_type);
     1.9 +    printk("hvmirq callback_via:0x%x.\n", hvm_irq->callback_via.gsi);
    1.10 +    
    1.11  
    1.12      for (i = 0; i < 4; i++)
    1.13          printk("hvmirq pci_link_route[%d]:0x%"PRIx8".\n", i, hvm_irq->pci_link_route[i]);
    1.14 @@ -507,7 +509,7 @@ static void hvmirq_info(struct hvm_irq *
    1.15      for (i = 0; i < 4; i++)
    1.16          printk("hvmirq pci_link_assert_count[%d]:0x%"PRIx8".\n", i, hvm_irq->pci_link_assert_count[i]);
    1.17  
    1.18 -    for (i = 0; i < 4; i++)
    1.19 +    for (i = 0; i < VIOAPIC_NUM_PINS; i++)
    1.20          printk("hvmirq gsi_assert_count[%d]:0x%"PRIx8".\n", i, hvm_irq->gsi_assert_count[i]);
    1.21  
    1.22      printk("hvmirq round_robin_prev_vcpu:0x%"PRIx8".\n", hvm_irq->round_robin_prev_vcpu);
    1.23 @@ -542,8 +544,9 @@ static void ioapic_save(hvm_domain_conte
    1.24      /* save hvm irq state */
    1.25      hvm_put_buffer(h, (char*)hvm_irq->pci_intx, 16);
    1.26      hvm_put_buffer(h, (char*)hvm_irq->isa_irq, 2);
    1.27 -    hvm_put_buffer(h, (char*)hvm_irq->callback_irq_wire, 1);
    1.28 -    hvm_put_32u(h, hvm_irq->callback_gsi);
    1.29 +    hvm_put_32u(h, hvm_irq->callback_via_asserted);
    1.30 +    hvm_put_32u(h, hvm_irq->callback_via_type);
    1.31 +    hvm_put_32u(h, hvm_irq->callback_via.gsi);
    1.32  
    1.33      for (i = 0; i < 4; i++)
    1.34          hvm_put_8u(h, hvm_irq->pci_link_route[i]);
    1.35 @@ -579,8 +582,9 @@ static int ioapic_load(hvm_domain_contex
    1.36      /* restore irq state */
    1.37      hvm_get_buffer(h, (char*)hvm_irq->pci_intx, 16);
    1.38      hvm_get_buffer(h, (char*)hvm_irq->isa_irq, 2);
    1.39 -    hvm_get_buffer(h, (char*)hvm_irq->callback_irq_wire, 1);
    1.40 -    hvm_irq->callback_gsi = hvm_get_32u(h);
    1.41 +    hvm_irq->callback_via_asserted = hvm_get_32u(h);
    1.42 +    hvm_irq->callback_via_type = hvm_get_32u(h);
    1.43 +    hvm_irq->callback_via.gsi = hvm_get_32u(h);
    1.44  
    1.45      for (i = 0; i < 4; i++)
    1.46          hvm_irq->pci_link_route[i] = hvm_get_8u(h);