diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-19 10:59:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-19 10:59:04 +0000 |
| commit | 6de76c5f324904c93e69f9a1e8e4fd0bd6f6b57a (patch) | |
| tree | 090f945eec21f203585aa44247977a73f13658fc /backends/hostmem-file.c | |
| parent | c79f01c9450bcf90c08a77f13fbf67bdba59a316 (diff) | |
| parent | def835f0da0d153b397071e6bb8f2b46f51f96b4 (diff) | |
| download | focaccia-qemu-6de76c5f324904c93e69f9a1e8e4fd0bd6f6b57a.tar.gz focaccia-qemu-6de76c5f324904c93e69f9a1e8e4fd0bd6f6b57a.zip | |
Merge remote-tracking branch 'remotes/ehabkost-gl/tags/machine-next-pull-request' into staging
Machine and x86 queue, 2021-02-18 Feature: * i386: Add the support for AMD EPYC 3rd generation processors (Babu Moger) Bug fix: * hostmem: Don't report pmem attribute if unsupported (Michal Privoznik) Cleanup: * device-crash-test: Remove problematic language (Eduardo Habkost) # gpg: Signature made Thu 18 Feb 2021 23:34:58 GMT # gpg: using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6 # gpg: issuer "ehabkost@redhat.com" # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full] # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost-gl/tags/machine-next-pull-request: hostmem: Don't report pmem attribute if unsupported device-crash-test: Remove problematic language i386: Add the support for AMD EPYC 3rd generation processors Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends/hostmem-file.c')
| -rw-r--r-- | backends/hostmem-file.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 733408e076..b683da9daf 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -124,6 +124,7 @@ static void file_memory_backend_set_align(Object *o, Visitor *v, fb->align = val; } +#ifdef CONFIG_LIBPMEM static bool file_memory_backend_get_pmem(Object *o, Error **errp) { return MEMORY_BACKEND_FILE(o)->is_pmem; @@ -140,17 +141,9 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) return; } -#ifndef CONFIG_LIBPMEM - if (value) { - error_setg(errp, "Lack of libpmem support while setting the 'pmem=on'" - " of %s. We can't ensure data persistence.", - object_get_typename(o)); - return; - } -#endif - fb->is_pmem = value; } +#endif /* CONFIG_LIBPMEM */ static bool file_memory_backend_get_readonly(Object *obj, Error **errp) { @@ -203,8 +196,10 @@ file_backend_class_init(ObjectClass *oc, void *data) file_memory_backend_get_align, file_memory_backend_set_align, NULL, NULL); +#ifdef CONFIG_LIBPMEM object_class_property_add_bool(oc, "pmem", file_memory_backend_get_pmem, file_memory_backend_set_pmem); +#endif object_class_property_add_bool(oc, "readonly", file_memory_backend_get_readonly, file_memory_backend_set_readonly); |