Commit 9889e04a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 



pc,pci,virtio fixes and cleanups

This includes pc and pci cleanups and enhancements,
and a virtio bugfix for level interrupts.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Sun 01 Sep 2013 03:15:36 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (3) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  virtio_pci: fix level interrupts with irqfd
  pc: reduce duplication, fix PIIX descriptions
  hw: Clean up bogus default boot order
  pci: add config space access traces
  pc: fix regression for 64 bit PCI memory
  pci: Introduce helper to retrieve a PCI device's DMA address space

Message-id: 1378023590-11109-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 5cff81f0 23fe2b3f

hw/alpha/dp264.c

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ static QEMUMachine clipper_machine = { 
    .init = clipper_init,

    .max_cpus = 4,

    .is_default = 1,

    DEFAULT_MACHINE_OPTIONS,

};



static void clipper_machine_init(void)

hw/arm/collie.c

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static QEMUMachine collie_machine = { 
    .name = "collie",

    .desc = "Collie PDA (SA-1110)",

    .init = collie_init,

    DEFAULT_MACHINE_OPTIONS,

};



static void collie_machine_init(void)

hw/arm/exynos4_boards.c

+0 −2
Original line number Diff line number Diff line
@@ -150,14 +150,12 @@ static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = { 
        .desc = "Samsung NURI board (Exynos4210)",

        .init = nuri_init,

        .max_cpus = EXYNOS4210_NCPUS,

        DEFAULT_MACHINE_OPTIONS,

    },

    [EXYNOS4_BOARD_SMDKC210] = {

        .name = "smdkc210",

        .desc = "Samsung SMDKC210 board (Exynos4210)",

        .init = smdkc210_init,

        .max_cpus = EXYNOS4210_NCPUS,

        DEFAULT_MACHINE_OPTIONS,

    },

};

hw/arm/gumstix.c

+0 −2
Original line number Diff line number Diff line
@@ -122,14 +122,12 @@ static QEMUMachine connex_machine = { 
    .name = "connex",

    .desc = "Gumstix Connex (PXA255)",

    .init = connex_init,

    DEFAULT_MACHINE_OPTIONS,

};



static QEMUMachine verdex_machine = {

    .name = "verdex",

    .desc = "Gumstix Verdex (PXA270)",

    .init = verdex_init,

    DEFAULT_MACHINE_OPTIONS,

};



static void gumstix_machine_init(void)

hw/arm/highbank.c

+0 −2
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ static QEMUMachine highbank_machine = { 
    .init = highbank_init,

    .block_default_type = IF_SCSI,

    .max_cpus = 4,

    DEFAULT_MACHINE_OPTIONS,

};



static QEMUMachine midway_machine = {
@@ -372,7 +371,6 @@ static QEMUMachine midway_machine = { 
    .init = midway_init,

    .block_default_type = IF_SCSI,

    .max_cpus = 4,

    DEFAULT_MACHINE_OPTIONS,

};



static void calxeda_machines_init(void)