diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 17:21:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 17:21:08 +0000 |
| commit | 0b0571dd246871f18b7d64b5279511e91e2a7bf6 (patch) | |
| tree | 5fe918d7f97873791ac23f8e3bae64483b3f0ec2 /xen-hvm-stub.c | |
| parent | 83446463dd7b7e3d7e69bcaa079d6a5d8cd3cd76 (diff) | |
| parent | 5a11d0f7549e24a10e178a9dc8ff5e698031d9a6 (diff) | |
| download | focaccia-qemu-0b0571dd246871f18b7d64b5279511e91e2a7bf6.tar.gz focaccia-qemu-0b0571dd246871f18b7d64b5279511e91e2a7bf6.zip | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160121' into staging
Xen 2016/01/21 # gpg: Signature made Thu 21 Jan 2016 16:58:50 GMT using RSA key ID 70E1AE90 # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>" * remotes/sstabellini/tags/xen-20160121: Xen PCI passthru: convert to realize() Add Error **errp for xen_pt_config_init() Add Error **errp for xen_pt_setup_vga() Add Error **errp for xen_host_pci_device_get() Xen: use qemu_strtoul instead of strtol Change xen_host_pci_sysfs_path() to return void xen-pvdevice: convert to realize() xen-hvm: Clean up xen_ram_alloc() error handling xen-hvm: Clean up xen_hvm_init() error handling xenfb.c: avoid expensive loops when prod <= out_cons MAINTAINERS: update Xen files Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'xen-hvm-stub.c')
| -rw-r--r-- | xen-hvm-stub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c index 6a39425da0..b9583674ca 100644 --- a/xen-hvm-stub.c +++ b/xen-hvm-stub.c @@ -30,7 +30,8 @@ void xen_hvm_inject_msi(uint64_t addr, uint32_t data) { } -void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr) +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr, + Error **errp) { } @@ -47,9 +48,8 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) { } -int xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) +void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) { - return 0; } void qmp_xen_set_global_dirty_log(bool enable, Error **errp) |